[Python-checkins] cpython: Issue #14779: Do not use get_config_var('SIZEOF_VOID_P') on OS X 64-/32-bit

stefan.krah python-checkins at python.org
Sat May 12 23:13:57 CEST 2012


http://hg.python.org/cpython/rev/8f22e5be18c8
changeset:   76885:8f22e5be18c8
user:        Stefan Krah <skrah at bytereef.org>
date:        Sat May 12 23:11:51 2012 +0200
summary:
  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.

files:
  Lib/test/test_buffer.py |  6 +++---
  1 files changed, 3 insertions(+), 3 deletions(-)


diff --git a/Lib/test/test_buffer.py b/Lib/test/test_buffer.py
--- a/Lib/test/test_buffer.py
+++ b/Lib/test/test_buffer.py
@@ -16,7 +16,6 @@
 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 @@
 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},

-- 
Repository URL: http://hg.python.org/cpython


More information about the Python-checkins mailing list