From: Ronald Oussoren <ronaldoussoren@mac.com>
Date: Tue, 3 Aug 2010 07:43:36 +0000 (+0000)
Subject: Merged revisions 83644 via svnmerge from
X-Git-Tag: v3.1.3rc1~407
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8f5a51233fc11fa93b4ffd0b21b7908c8407c49e;p=thirdparty%2FPython%2Fcpython.git

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 4e53f4279bd1..7fba14364200 100755
--- 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'