From 0ab67ee79ea6c536168b9ae51af0a85c9b075a40 Mon Sep 17 00:00:00 2001
From: Ned Deily <nad@acm.org>
Date: Wed, 13 Jul 2011 15:05:31 -0700
Subject: [PATCH] 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.

---
 Doc/library/platform.rst  | 3 ---
 Lib/platform.py           | 1 +
 Lib/test/test_platform.py | 2 +-
 Misc/NEWS                 | 3 +++
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Doc/library/platform.rst b/Doc/library/platform.rst
index c2b85e6096d..069993c3692 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 6db7f19e48c..710f21e706c 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 1ae5888250d..941d428c19e 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')
 
diff --git a/Misc/NEWS b/Misc/NEWS
index b282c13aa63..7271ef901ed 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -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.