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

(cherry picked from commit 1e7e4519a8ddc2239101a0146d788c9161143a77)

Co-authored-by: Dennis Sweeney <36520290+sweeneyde@users.noreply.github.com>

diff --git a/Lib/platform.py b/Lib/platform.py
index 6fbb7b08c598e3d1782479ab492e4d8c964604ef..994d892c5e6166921b05e9aeaee4d95c0a579c7a 100755 (executable)
--- a/Lib/platform.py
+++ b/Lib/platform.py
@@ -395,9 +395,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 (file)
index 0000000..d4bf698
--- /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.