[Python-checkins] bpo-40459: Fix NameError in platform.py (GH-19855)

[Dennis Sweeney]

https://github.com/python/cpython/commit/1e7e4519a8ddc2239101a0146d788c9161143a77
commit: 1e7e4519a8ddc2239101a0146d788c9161143a77
branch: master
author: Dennis Sweeney <36520290+sweeneyde at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2020-05-05T11:33:17+09:00
summary:

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

files:
A Misc/NEWS.d/next/Library/2020-05-02-04-29-31.bpo-40459.fSAYVD.rst
M Lib/platform.py

diff --git a/Lib/platform.py b/Lib/platform.py
index 3f442ef0fbb65..049c2c6ef25a1 100755
--- a/Lib/platform.py
+++ b/Lib/platform.py
@@ -398,9 +398,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
new file mode 100644
index 0000000000000..d4bf6987fa260
--- /dev/null
+++ 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.