From: Jack Jansen <jack.jansen@cwi.nl>
Date: Mon, 11 Aug 2003 11:08:49 +0000 (+0000)
Subject: Bug fix for #780461: 'sysu' gestalt selector is meaningless on MacOSX,
X-Git-Tag: v2.4a1~1765
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a290e3d7c6c15454496d5a8bb163af61f99f52c0;p=python

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 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