changeset: 77006:967b06d56a69 user: Stefan Krah date: Wed May 16 20:41:56 2012 +0200 files: Lib/test/test_buffer.py Modules/_testbuffer.c description: Issue #14779: Get sizeof(void *) directly rather than relying on sysconfig. diff -r 87fa250c05cd -r 967b06d56a69 Lib/test/test_buffer.py --- a/Lib/test/test_buffer.py Wed May 16 20:20:03 2012 +0200 +++ b/Lib/test/test_buffer.py Wed May 16 20:41:56 2012 +0200 @@ -747,10 +747,8 @@ class TestBufferProtocol(unittest.TestCase): def setUp(self): - 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 sys.maxsize> 2**32 else 4 + # The suboffsets tests need sizeof(void *). + self.sizeof_void_p = get_sizeof_void_p() def verify(self, result, obj=-1, itemsize={1}, fmt=-1, readonly={1}, diff -r 87fa250c05cd -r 967b06d56a69 Modules/_testbuffer.c --- a/Modules/_testbuffer.c Wed May 16 20:20:03 2012 +0200 +++ b/Modules/_testbuffer.c Wed May 16 20:41:56 2012 +0200 @@ -2337,6 +2337,12 @@ return ret; } +static PyObject * +get_sizeof_void_p(PyObject *self) +{ + return PyLong_FromSize_t(sizeof(void *)); +} + static char get_ascii_order(PyObject *order) { @@ -2726,6 +2732,7 @@ static struct PyMethodDef _testbuffer_functions[] = { {"slice_indices", slice_indices, METH_VARARGS, NULL}, {"get_pointer", get_pointer, METH_VARARGS, NULL}, + {"get_sizeof_void_p", (PyCFunction)get_sizeof_void_p, METH_NOARGS, NULL}, {"get_contiguous", get_contiguous, METH_VARARGS, NULL}, {"is_contiguous", is_contiguous, METH_VARARGS, NULL}, {"cmp_contig", cmp_contig, METH_VARARGS, NULL},