diff options
| author | Ronald Oussoren <ronaldoussoren@mac.com> | 2010-08-03 08:09:15 +0000 |
|---|---|---|
| committer | Ronald Oussoren <ronaldoussoren@mac.com> | 2010-08-03 08:09:15 +0000 |
| commit | f7a13b3210299820fc4e52cb359f916ff5aad269 (patch) | |
| tree | 31728285a76246bbdb952876d9d8d117928a1f3a | |
| parent | bb4d9f6c3d15e70df415fb9661de1a8fb8542b81 (diff) | |
| download | cpython-git-f7a13b3210299820fc4e52cb359f916ff5aad269.tar.gz | |
Merged revisions 83646 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/release27-maint
................
r83646 | ronald.oussoren | 2010-08-03 09:44:35 +0200 (Tue, 03 Aug 2010) | 9 lines
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 9e7ee5ffd8..c501456a2f 100755 --- a/Lib/platform.py +++ b/Lib/platform.py @@ -771,7 +771,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' |