[Python-checkins] python/dist/src/Lib platform.py,1.6,1.7

jackjansen at users.sourceforge.net jackjansen at users.sourceforge.net
Mon Aug 11 05:08:51 EDT 2003


Update of /cvsroot/python/python/dist/src/Lib
In directory sc8-pr-cvs1:/tmp/cvs-serv3502

Modified Files:
	platform.py 
Log Message:
Bug fix for #780461: 'sysu' gestalt selector is meaningless on MacOSX,
but attempting to get it resulted in a crash. Fixed. Backport candidate.


Index: platform.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/platform.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** platform.py	5 Aug 2003 03:52:04 -0000	1.6
--- platform.py	11 Aug 2003 11:08:49 -0000	1.7
***************
*** 526,529 ****
--- 526,530 ----
  
      from gestalt import gestalt
+     import MacOS
      l = []
      append = l.append
***************
*** 531,535 ****
          try:
              append(gestalt(selector))
!         except RuntimeError:
              append(default)
      return l
--- 532,536 ----
          try:
              append(gestalt(selector))
!         except (RuntimeError, MacOS.Error):
              append(default)
      return l
***************
*** 558,561 ****
--- 559,563 ----
      try:
          import gestalt
+         import MacOS
      except ImportError:
          return release,versioninfo,machine





More information about the Python-checkins mailing list