mirror of
https://github.com/python/cpython.git
synced 2025-08-23 02:04:56 +00:00
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.
This commit is contained in:
parent
04b2e69e67
commit
094d0e002c
1 changed files with 3 additions and 3 deletions
|
@ -16,7 +16,6 @@ from test import support
|
||||||
from itertools import permutations, product
|
from itertools import permutations, product
|
||||||
from random import randrange, sample, choice
|
from random import randrange, sample, choice
|
||||||
from sysconfig import get_config_var
|
from sysconfig import get_config_var
|
||||||
from platform import architecture
|
|
||||||
import warnings
|
import warnings
|
||||||
import sys, array, io
|
import sys, array, io
|
||||||
from decimal import Decimal
|
from decimal import Decimal
|
||||||
|
@ -748,9 +747,10 @@ if SHORT_TEST:
|
||||||
class TestBufferProtocol(unittest.TestCase):
|
class TestBufferProtocol(unittest.TestCase):
|
||||||
|
|
||||||
def setUp(self):
|
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:
|
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,
|
def verify(self, result, obj=-1,
|
||||||
itemsize={1}, fmt=-1, readonly={1},
|
itemsize={1}, fmt=-1, readonly={1},
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue