[Python-checkins] r83651 - in python/branches/release26-maint: Lib/platform.py

[ronald.oussoren]

Author: ronald.oussoren
Date: Tue Aug  3 10:09:15 2010
New Revision: 83651

Log:
Merged revisions 83646 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/release27-maint

................
  r83646 | ronald.oussoren | 2010-08-03 09:44:35 +0200 (Tue, 03 Aug 2010) | 9 lines
  
  Merged revisions 83644 via svnmerge from 
  svn+ssh://pythondev@svn.python.org/python/branches/py3k
  
  ........
    r83644 | ronald.oussoren | 2010-08-03 09:42:42 +0200 (Tue, 03 Aug 2010) | 2 lines
    
    Fix for issue 9455: platform.mac_ver() broken on OSX/ppc
  ........
................


Modified:
   python/branches/release26-maint/   (props changed)
   python/branches/release26-maint/Lib/platform.py

Modified: python/branches/release26-maint/Lib/platform.py
==============================================================================
--- python/branches/release26-maint/Lib/platform.py	(original)
+++ python/branches/release26-maint/Lib/platform.py	Tue Aug  3 10:09:15 2010
@@ -771,7 +771,7 @@
     release = pl['ProductVersion']
     versioninfo=('', '', '')
     machine = os.uname()[4]
-    if machine == 'ppc':
+    if machine in ('ppc', 'Power Macintosh'):
         # for compatibility with the gestalt based code
         machine = 'PowerPC'