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

Fixes platform.win32_ver on non-Windows platforms (GH-12912) 

(cherry picked from commit d307d05350)

Co-authored-by: Steve Dower <steve.dower@microsoft.com>
This commit is contained in:
Miss Islington (bot) 2019-04-22 11:59:08 -07:00 committed by GitHub
parent 36aecc0079
commit 9344d74f7b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Lib/platform.py
View File

@ -535,10 +535,6 @@ def win32_ver(release='', version='', csd='', ptype=''):
from sys import getwindowsversion from sys import getwindowsversion
except ImportError: except ImportError:
return release, version, csd, ptype return release, version, csd, ptype
try:
from winreg import OpenKeyEx, QueryValueEx, CloseKey, HKEY_LOCAL_MACHINE
except ImportError:
from _winreg import OpenKeyEx, QueryValueEx, CloseKey, HKEY_LOCAL_MACHINE
winver = getwindowsversion() winver = getwindowsversion()
maj, min, build = winver.platform_version or winver[:3] maj, min, build = winver.platform_version or winver[:3]
@ -564,16 +560,20 @@ def win32_ver(release='', version='', csd='', ptype=''):
_WIN32_SERVER_RELEASES.get((maj, None)) or _WIN32_SERVER_RELEASES.get((maj, None)) or
release) release)
key = None
try: try:
key = OpenKeyEx(HKEY_LOCAL_MACHINE, try:
r'SOFTWARE\Microsoft\Windows NT\CurrentVersion') import winreg
except ImportError:
import _winreg as winreg
except ImportError:
pass
else:
try:
cvkey = r'SOFTWARE\Microsoft\Windows NT\CurrentVersion'
with winreg.OpenKeyEx(HKEY_LOCAL_MACHINE, cvkey) as key:
ptype = QueryValueEx(key, 'CurrentType')[0] ptype = QueryValueEx(key, 'CurrentType')[0]
except: except:
pass pass
finally:
if key:
CloseKey(key)
return release, version, csd, ptype return release, version, csd, ptype