traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge from 3.4

This commit is contained in:
Steve Dower 2015-09-22 17:35:42 -07:00
parent 81a618315e 8f278f1662
commit 5b1640cd2b
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Lib/platform.py
View File

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