summaryrefslogtreecommitdiff
path: root/Lib/platform.py
diff options
context:
space:
mode:
authorRonald Oussoren <ronaldoussoren@mac.com>2010-08-03 07:44:35 +0000
committerRonald Oussoren <ronaldoussoren@mac.com>2010-08-03 07:44:35 +0000
commit22e3e694ed703cb0a6e1dcb6bd250c74808b9602 (patch)
treeae21f4aeffdd6a5efc64531987024fd05499ecac /Lib/platform.py
parentac72e58a279bb8a46047c87ddd7eeb0886a07692 (diff)
downloadcpython-git-22e3e694ed703cb0a6e1dcb6bd250c74808b9602.tar.gz
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 ........
Diffstat (limited to 'Lib/platform.py')
-rwxr-xr-xLib/platform.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/platform.py b/Lib/platform.py
index 0f415df954..0f24553669 100755
--- 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'