diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2015-09-22 17:35:42 -0700 |
|---|---|---|
| committer | Steve Dower <steve.dower@microsoft.com> | 2015-09-22 17:35:42 -0700 |
| commit | 5b1640cd2bcab78b3c14ac425b9d2c6d7926df17 (patch) | |
| tree | c72f41ab7a4612737f564ad0924b6f56862ba6e8 /Lib/platform.py | |
| parent | 81a618315eee447ddfab18b44210586fee0ed3f1 (diff) | |
| parent | 8f278f166255bb02dbee21e98689bb2fed58b3df (diff) | |
| download | cpython-git-5b1640cd2bcab78b3c14ac425b9d2c6d7926df17.tar.gz | |
Merge from 3.4
Diffstat (limited to 'Lib/platform.py')
| -rwxr-xr-x | Lib/platform.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Lib/platform.py b/Lib/platform.py index ecc9fb3a21..f3d2c42387 100755 --- 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=''): - from sys import getwindowsversion + try: + from sys import getwindowsversion + except ImportError: + return release, version, csd, ptype try: from winreg import OpenKeyEx, QueryValueEx, CloseKey, HKEY_LOCAL_MACHINE except ImportError: |