From: Stefan Krah <skrah@bytereef.org>
Date: Sat, 12 May 2012 21:11:51 +0000 (+0200)
Subject: Issue #14779: Do not use get_config_var('SIZEOF_VOID_P') on OS X 64-/32-bit
X-Git-Tag: v3.3.0a4~198
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=094d0e002c8e21aa5872b37953d7e135df1d3e9c;p=thirdparty%2FPython%2Fcpython.git

Issue #14779: Do not use get_config_var('SIZEOF_VOID_P') on OS X 64-/32-bit
universal: it returns a meaningless result. Use sys.maxsize instead of
platform.architecture as a fallback. Patch by Ned Deily.
---

diff --git a/Lib/test/test_buffer.py b/Lib/test/test_buffer.py
index e0006f23ebac..258c850a5a87 100644
--- a/Lib/test/test_buffer.py
+++ b/Lib/test/test_buffer.py
@@ -16,7 +16,6 @@ from test import support
 from itertools import permutations, product
 from random import randrange, sample, choice
 from sysconfig import get_config_var
-from platform import architecture
 import warnings
 import sys, array, io
 from decimal import Decimal
@@ -748,9 +747,10 @@ if SHORT_TEST:
 class TestBufferProtocol(unittest.TestCase):
 
     def setUp(self):
-        self.sizeof_void_p = get_config_var('SIZEOF_VOID_P')
+        self.sizeof_void_p = get_config_var('SIZEOF_VOID_P') \
+                                if sys.platform != 'darwin' else None
         if not self.sizeof_void_p:
-            self.sizeof_void_p = 8 if architecture()[0] == '64bit' else 4
+            self.sizeof_void_p = 8 if sys.maxsize > 2**32 else 4
 
     def verify(self, result, obj=-1,
                      itemsize={1}, fmt=-1, readonly={1},