Bug fix for #780461: 'sysu' gestalt selector is meaningless on MacOSX,

but attempting to get it resulted in a crash. Fixed. Backport candidate.

diff --git a/Lib/platform.py b/Lib/platform.py
index 9404b5c2e1849e57c8d46f15ead27487772a8dd4..1547e1247fe7c339e84ed3d382918fc20ec99abc 100755 (executable)
--- 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