Merge from 3.4

2015-09-22 17:35:42 -07:00 · 2015-09-22 17:35:42 -07:00 · 5b1640cd2b
parent 81a618315e 8f278f1662
commit 5b1640cd2b
1 changed files with 4 additions and 1 deletions
--- a/Lib/platform.py
+++ b/Lib/platform.py
@ -560,7 +560,10 @@ def _get_real_winver(maj, min, build):
    return maj, min, build

 def win32_ver(release='', version='', csd='', ptype=''):
+    try:
        from sys import getwindowsversion
+    except ImportError:
+        return release, version, csd, ptype
    try:
        from winreg import OpenKeyEx, QueryValueEx, CloseKey, HKEY_LOCAL_MACHINE
    except ImportError: