diff options
| -rw-r--r-- | Doc/library/platform.rst | 3 | ||||
| -rwxr-xr-x | Lib/platform.py | 1 | ||||
| -rw-r--r-- | Lib/test/test_platform.py | 2 | ||||
| -rw-r--r-- | Misc/NEWS | 3 |
4 files changed, 5 insertions, 4 deletions
diff --git a/Doc/library/platform.rst b/Doc/library/platform.rst index c2b85e6..069993c 100644 --- a/Doc/library/platform.rst +++ b/Doc/library/platform.rst @@ -233,9 +233,6 @@ Mac OS Platform Entries which cannot be determined are set to ``''``. All tuple entries are strings. - Documentation for the underlying :cfunc:`gestalt` API is available online at - http://www.rgaros.nl/gestalt/. - Unix Platforms -------------- 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') @@ -101,6 +101,9 @@ Build Tests ----- +- Issue #12549: Correct test_platform to not fail when OS X returns 'x86_64' + as the processor type on some Mac systems. + - Skip network tests when getaddrinfo() returns EAI_AGAIN, meaning a temporary failure in name resolution. |