diff options
author | Jack Jansen <jack.jansen@cwi.nl> | 2003-08-11 11:08:49 +0000 |
---|---|---|
committer | Jack Jansen <jack.jansen@cwi.nl> | 2003-08-11 11:08:49 +0000 |
commit | 51225f4b57ccc019efd8859ca1634a7739f4c00b (patch) | |
tree | 12747a93eb33efc37ff00e17a294f6d5ddb1a4eb /Lib/platform.py | |
parent | 1e74b61da4c7a39021b2988ae03244052a780fb1 (diff) | |
download | cpython-51225f4b57ccc019efd8859ca1634a7739f4c00b.tar.gz |
Bug fix for #780461: 'sysu' gestalt selector is meaningless on MacOSX,
but attempting to get it resulted in a crash. Fixed. Backport candidate.
Diffstat (limited to 'Lib/platform.py')
-rwxr-xr-x | Lib/platform.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Lib/platform.py b/Lib/platform.py index 9404b5c2e1..1547e1247f 100755 --- a/Lib/platform.py +++ b/Lib/platform.py @@ -525,12 +525,13 @@ def win32_ver(release='',version='',csd='',ptype=''): def _mac_ver_lookup(selectors,default=None): from gestalt import gestalt + import MacOS l = [] append = l.append for selector in selectors: try: append(gestalt(selector)) - except RuntimeError: + except (RuntimeError, MacOS.Error): append(default) return l @@ -557,6 +558,7 @@ def mac_ver(release='',versioninfo=('','',''),machine=''): # Check whether the version info module is available try: import gestalt + import MacOS except ImportError: return release,versioninfo,machine # Get the infos |