diff options
| author | Ned Deily <nad@acm.org> | 2011-07-13 22:07:04 (GMT) |
|---|---|---|
| committer | Ned Deily <nad@acm.org> | 2011-07-13 22:07:04 (GMT) |
| commit | 58e3350bd48d59c273e320c408f2546e6d09146e (patch) | |
| tree | 5c7f3620994e92b7860c718b7bda21ba6e2a1e69 /Lib | |
| parent | 6636121950a08de9d437cc2d76ac272cdceb7ecc (diff) | |
| download | cpython-58e3350bd48d59c273e320c408f2546e6d09146e.zip cpython-58e3350bd48d59c273e320c408f2546e6d09146e.tar.gz cpython-58e3350bd48d59c273e320c408f2546e6d09146e.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 967491a..6e301da 100755 --- a/Lib/platform.py +++ b/Lib/platform.py @@ -758,6 +758,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 ec134a1..8751aa8 100644 --- a/Lib/test/test_platform.py +++ b/Lib/test/test_platform.py @@ -194,7 +194,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') |