bpo-40459: Fix NameError in platform.py (GH-19855)

(cherry picked from commit 1e7e451) Co-authored-by: Dennis Sweeney <36520290+sweeneyde@users.noreply.github.com>
python · May 5, 2020 · 8ddf915 · 8ddf915
1 parent 4eec39a
commit 8ddf915
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/Lib/platform.py b/Lib/platform.py
@@ -570,9 +570,9 @@ def win32_ver(release='', version='', csd='', ptype=''):
  else:
  try:
  cvkey = r'SOFTWARE\Microsoft\Windows NT\CurrentVersion'
- with winreg.OpenKeyEx(HKEY_LOCAL_MACHINE, cvkey) as key:
- ptype = QueryValueEx(key, 'CurrentType')[0]
- except:
+ with winreg.OpenKeyEx(winreg.HKEY_LOCAL_MACHINE, cvkey) as key:
+ ptype = winreg.QueryValueEx(key, 'CurrentType')[0]
+ except OSError:
  pass
 
  return release, version, csd, ptype

diff --git a/Misc/NEWS.d/next/Library/2020-05-02-04-29-31.bpo-40459.fSAYVD.rst b/Misc/NEWS.d/next/Library/2020-05-02-04-29-31.bpo-40459.fSAYVD.rst
@@ -0,0 +1 @@
+:func:`platform.win32_ver` now produces correct *ptype* strings instead of empty strings.