From f7a13b3210299820fc4e52cb359f916ff5aad269 Mon Sep 17 00:00:00 2001 From: Ronald Oussoren Date: Tue, 3 Aug 2010 08:09:15 +0000 Subject: 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 ........ ................ --- Lib/platform.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lib/platform.py b/Lib/platform.py index 9e7ee5f..c501456 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' -- cgit v0.12