[Python-checkins] Fixes platform.win32_ver on non-Windows platforms (GH-12912)
Miss Islington (bot)
webhook-mailer at python.org
Mon Apr 22 15:01:27 EDT 2019
https://github.com/python/cpython/commit/9344d74f7bf1039326e0e15c6d94f0d9e0f63d84
commit: 9344d74f7bf1039326e0e15c6d94f0d9e0f63d84
branch: 3.7
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2019-04-22T11:59:08-07:00
summary:
Fixes platform.win32_ver on non-Windows platforms (GH-12912)
(cherry picked from commit d307d05350e26a7a5f8f74db9af632a15215b50f)
Co-authored-by: Steve Dower <steve.dower at microsoft.com>
files:
M Lib/platform.py
diff --git a/Lib/platform.py b/Lib/platform.py
index 0c6fc03efa9f..8ed2807df109 100755
--- a/Lib/platform.py
+++ b/Lib/platform.py
@@ -535,10 +535,6 @@ def win32_ver(release='', version='', csd='', ptype=''):
from sys import getwindowsversion
except ImportError:
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()
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
release)
- key = None
try:
- key = OpenKeyEx(HKEY_LOCAL_MACHINE,
- r'SOFTWARE\Microsoft\Windows NT\CurrentVersion')
- ptype = QueryValueEx(key, 'CurrentType')[0]
- except:
+ try:
+ import winreg
+ except ImportError:
+ import _winreg as winreg
+ except ImportError:
pass
- finally:
- if key:
- CloseKey(key)
+ else:
+ try:
+ cvkey = r'SOFTWARE\Microsoft\Windows NT\CurrentVersion'
+ with winreg.OpenKeyEx(HKEY_LOCAL_MACHINE, cvkey) as key:
+ ptype = QueryValueEx(key, 'CurrentType')[0]
+ except:
+ pass
return release, version, csd, ptype
More information about the Python-checkins
mailing list