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.

diff --git a/Doc/library/platform.rst b/Doc/library/platform.rst
index d8e516633e6c0b8708a18d4defdb474ce52f1e0f..929936e781ee7d91626033a45db3ab374d05dfc5 100644 (file)
--- a/Doc/library/platform.rst
+++ b/Doc/library/platform.rst
@@ -228,9 +228,6 @@ Mac OS Platform
    Entries which cannot be determined are set to ``''``.  All tuple entries are
    strings.
 
-   Documentation for the underlying :c:func:`gestalt` API is available online at
-   http://www.rgaros.nl/gestalt/.
-
 
 Unix Platforms
 --------------

diff --git a/Lib/platform.py b/Lib/platform.py
index 967491a8278ad3d456ca06deb75ad363084fa01f..6e301da0e17960fd16e666c16ad80ba51e4a49c7 100755 (executable)
--- 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 ec134a17e054600cfca32433c58579243581cddb..8751aa86ba840918284ddbf93b83e55e4f1ea43a 100644 (file)
--- 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')
 

diff --git a/Misc/NEWS b/Misc/NEWS
index caa12a61d17cd209e356d5c87dc888a68569caac..6bb9f9f1c1c843d439a80c871f35a8eb31879144 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -56,6 +56,9 @@ C-API
 Tests
 -----
 
+- Issue #12549: Correct test_platform to not fail when OS X returns 'x86_64'
+  as the processor type on some Mac systems.
+
 - Avoid failing in test_robotparser when mueblesmoraleda.com is flaky and
   an overzealous DNS service (e.g. OpenDNS) redirects to a placeholder
   Web site.