commit 9344d74f7bf1039326e0e15c6d94f0d9e0f63d84
author Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> Mon Apr 22 11:59:08 2019 -0700
committer GitHub <noreply@github.com> Mon Apr 22 11:59:08 2019 -0700
tree 49030c8ca07b93a077ab41659602443d3f843f7a
parent 36aecc0079af0ec65add8ffb5bcdea9a594baca4

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

(cherry picked from commit d307d05350e26a7a5f8f74db9af632a15215b50f)

Co-authored-by: Steve Dower <steve.dower@microsoft.com>

Lib/platform.py

diff --git a/Lib/platform.py b/Lib/platform.py
index 0c6fc03..8ed2807 100755
--- a/Lib/platform.py
+++ b/Lib/platform.py
@@ -535,10 +535,6 @@
         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 @@
                    _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