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

diff --git a/Lib/platform.py b/Lib/platform.py
index 4e53f4279bd1c4c2f5d94f5879c05aea8f1a5072..7fba14364200857b3d1a58b1974050bdcf424949 100755 (executable)
--- a/Lib/platform.py
+++ b/Lib/platform.py
@@ -749,7 +749,7 @@ def _mac_ver_xml():
     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'