diff options
| author | Ned Deily <nad@acm.org> | 2011-07-13 22:05:31 (GMT) |
|---|---|---|
| committer | Ned Deily <nad@acm.org> | 2011-07-13 22:05:31 (GMT) |
| commit | 0ab67ee79ea6c536168b9ae51af0a85c9b075a40 (patch) | |
| tree | 88a82f99e7ad0a461b08ab86342e99a72b8ec70a /Lib | |
| parent | bf547fd3f255430bb32916b9949f1f8e72aee951 (diff) | |
| download | cpython-0ab67ee79ea6c536168b9ae51af0a85c9b075a40.zip cpython-0ab67ee79ea6c536168b9ae51af0a85c9b075a40.tar.gz cpython-0ab67ee79ea6c536168b9ae51af0a85c9b075a40.tar.bz2 | |
Issue #12549: Correct test_platform to not fail when OS X returns 'x86_64'
as the processor type on some Mac systems. Also fix NameError in fallback
_mac_ver_gestalt function. And remove out-of-date URL in docs.
Diffstat (limited to 'Lib')
| -rwxr-xr-x | Lib/platform.py | 1 | ||||
| -rw-r--r-- | Lib/test/test_platform.py | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/Lib/platform.py b/Lib/platform.py index 6db7f19..710f21e 100755 --- a/Lib/platform.py +++ b/Lib/platform.py @@ -765,6 +765,7 @@ def _mac_ver_gestalt(): 0x2: 'PowerPC', 0xa: 'i386'}.get(sysa,'') + versioninfo=('', '', '') return release,versioninfo,machine def _mac_ver_xml(): diff --git a/Lib/test/test_platform.py b/Lib/test/test_platform.py index 1ae5888..941d428 100644 --- a/Lib/test/test_platform.py +++ b/Lib/test/test_platform.py @@ -191,7 +191,7 @@ class PlatformTest(unittest.TestCase): self.assertEqual(res[1], ('', '', '')) if sys.byteorder == 'little': - self.assertEqual(res[2], 'i386') + self.assertIn(res[2], ('i386', 'x86_64')) else: self.assertEqual(res[2], 'PowerPC') |