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 0f415df9541bec963347ad437872811d82099d52..0f24553669c809fd0617978e2968c53e56093912 100755 (executable)
--- a/Lib/platform.py
+++ b/Lib/platform.py
@@ -781,7 +781,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'