Merge from 3.5

This commit is contained in:
Steve Dower 2015-09-22 17:35:55 -07:00
commit 697c43d389

View file

@ -560,7 +560,10 @@ class VS_FIXEDFILEINFO(Structure):
return maj, min, build
def win32_ver(release='', version='', csd='', ptype=''):
from sys import getwindowsversion
try:
from sys import getwindowsversion
except ImportError:
return release, version, csd, ptype
try:
from winreg import OpenKeyEx, QueryValueEx, CloseKey, HKEY_LOCAL_MACHINE
except ImportError: