diff options
author | Ronald Oussoren <ronaldoussoren@mac.com> | 2010-08-03 07:43:36 (GMT) |
---|---|---|
committer | Ronald Oussoren <ronaldoussoren@mac.com> | 2010-08-03 07:43:36 (GMT) |
commit | 8f5a51233fc11fa93b4ffd0b21b7908c8407c49e (patch) | |
tree | 7ea748a4fff524433f965464d2b21e6d588e63bc | |
parent | 6fde20920728ac50a7dc725daef0db287a2e674c (diff) | |
download | cpython-8f5a51233fc11fa93b4ffd0b21b7908c8407c49e.zip cpython-8f5a51233fc11fa93b4ffd0b21b7908c8407c49e.tar.gz cpython-8f5a51233fc11fa93b4ffd0b21b7908c8407c49e.tar.bz2 |
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
........
-rwxr-xr-x | Lib/platform.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/platform.py b/Lib/platform.py index 4e53f42..7fba143 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' |