diff options
| -rw-r--r-- | Lib/test/test_structmembers.py | 43 | ||||
| -rw-r--r-- | Misc/NEWS | 2 | ||||
| -rw-r--r-- | Modules/_testcapimodule.c | 17 | ||||
| -rw-r--r-- | Python/structmember.c | 6 |
4 files changed, 48 insertions, 20 deletions
diff --git a/Lib/test/test_structmembers.py b/Lib/test/test_structmembers.py index e1a0e6b..4eba7f0 100644 --- a/Lib/test/test_structmembers.py +++ b/Lib/test/test_structmembers.py @@ -20,17 +20,20 @@ ts=test_structmembersType(False, # T_BOOL 8, # T_ULONG 23, # T_PYSSIZET 9.99999,# T_FLOAT - 10.1010101010 # T_DOUBLE + 10.1010101010, # T_DOUBLE + "hi" # T_STRING_INPLACE ) class ReadWriteTests(unittest.TestCase): - def test_types(self): + + def test_bool(self): ts.T_BOOL = True self.assertEquals(ts.T_BOOL, True) ts.T_BOOL = False self.assertEquals(ts.T_BOOL, False) self.assertRaises(TypeError, setattr, ts, 'T_BOOL', 1) + def test_byte(self): ts.T_BYTE = CHAR_MAX self.assertEquals(ts.T_BYTE, CHAR_MAX) ts.T_BYTE = CHAR_MIN @@ -38,6 +41,7 @@ class ReadWriteTests(unittest.TestCase): ts.T_UBYTE = UCHAR_MAX self.assertEquals(ts.T_UBYTE, UCHAR_MAX) + def test_short(self): ts.T_SHORT = SHRT_MAX self.assertEquals(ts.T_SHORT, SHRT_MAX) ts.T_SHORT = SHRT_MIN @@ -45,6 +49,7 @@ class ReadWriteTests(unittest.TestCase): ts.T_USHORT = USHRT_MAX self.assertEquals(ts.T_USHORT, USHRT_MAX) + def test_int(self): ts.T_INT = INT_MAX self.assertEquals(ts.T_INT, INT_MAX) ts.T_INT = INT_MIN @@ -52,6 +57,7 @@ class ReadWriteTests(unittest.TestCase): ts.T_UINT = UINT_MAX self.assertEquals(ts.T_UINT, UINT_MAX) + def test_long(self): ts.T_LONG = LONG_MAX self.assertEquals(ts.T_LONG, LONG_MAX) ts.T_LONG = LONG_MIN @@ -59,26 +65,27 @@ class ReadWriteTests(unittest.TestCase): ts.T_ULONG = ULONG_MAX self.assertEquals(ts.T_ULONG, ULONG_MAX) + def test_py_ssize_t(self): ts.T_PYSSIZET = PY_SSIZE_T_MAX self.assertEquals(ts.T_PYSSIZET, PY_SSIZE_T_MAX) ts.T_PYSSIZET = PY_SSIZE_T_MIN self.assertEquals(ts.T_PYSSIZET, PY_SSIZE_T_MIN) - ## T_LONGLONG and T_ULONGLONG may not be present on some platforms - if hasattr(ts, 'T_LONGLONG'): - ts.T_LONGLONG = LLONG_MAX - self.assertEquals(ts.T_LONGLONG, LLONG_MAX) - ts.T_LONGLONG = LLONG_MIN - self.assertEquals(ts.T_LONGLONG, LLONG_MIN) + @unittest.skipUnless(hasattr(ts, "T_LONGLONG"), "long long not present") + def test_longlong(self): + ts.T_LONGLONG = LLONG_MAX + self.assertEquals(ts.T_LONGLONG, LLONG_MAX) + ts.T_LONGLONG = LLONG_MIN + self.assertEquals(ts.T_LONGLONG, LLONG_MIN) - ts.T_ULONGLONG = ULLONG_MAX - self.assertEquals(ts.T_ULONGLONG, ULLONG_MAX) + ts.T_ULONGLONG = ULLONG_MAX + self.assertEquals(ts.T_ULONGLONG, ULLONG_MAX) - ## make sure these will accept a plain int as well as a long - ts.T_LONGLONG = 3 - self.assertEquals(ts.T_LONGLONG, 3) - ts.T_ULONGLONG = 4 - self.assertEquals(ts.T_ULONGLONG, 4) + ## make sure these will accept a plain int as well as a long + ts.T_LONGLONG = 3 + self.assertEquals(ts.T_LONGLONG, 3) + ts.T_ULONGLONG = 4 + self.assertEquals(ts.T_ULONGLONG, 4) def test_bad_assignments(self): # XXX testing of T_UINT and T_ULONG temporarily disabled; @@ -91,7 +98,6 @@ class ReadWriteTests(unittest.TestCase): 'T_LONG', 'T_ULONG', 'T_PYSSIZET' ] - if hasattr(ts, 'T_LONGLONG'): integer_attributes.extend(['T_LONGLONG', 'T_ULONGLONG']) @@ -101,6 +107,11 @@ class ReadWriteTests(unittest.TestCase): for attr in integer_attributes: self.assertRaises(TypeError, setattr, ts, attr, nonint) + def test_inplace_string(self): + self.assertEquals(ts.T_STRING_INPLACE, "hi") + self.assertRaises(TypeError, setattr, ts, "T_STRING_INPLACE", "s") + self.assertRaises(TypeError, delattr, ts, "T_STRING_INPLACE") + class TestWarnings(unittest.TestCase): @@ -12,6 +12,8 @@ What's New in Python 3.2 Alpha 1? Core and Builtins ----------------- +- Raise a TypeError when trying to delete a T_STRING_INPLACE struct member. + - Issue #8211: Save/restore CFLAGS around AC_PROG_CC in configure.in, compiler optimizations are disabled when --with-pydebug is used. diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c index 1be3c66..87f9d8b 100644 --- a/Modules/_testcapimodule.c +++ b/Modules/_testcapimodule.c @@ -2087,6 +2087,7 @@ typedef struct { Py_ssize_t pyssizet_member; float float_member; double double_member; + char inplace_member[5]; #ifdef HAVE_LONG_LONG PY_LONG_LONG longlong_member; unsigned PY_LONG_LONG ulonglong_member; @@ -2111,6 +2112,7 @@ static struct PyMemberDef test_members[] = { {"T_PYSSIZET", T_PYSSIZET, offsetof(test_structmembers, structmembers.pyssizet_member), 0, NULL}, {"T_FLOAT", T_FLOAT, offsetof(test_structmembers, structmembers.float_member), 0, NULL}, {"T_DOUBLE", T_DOUBLE, offsetof(test_structmembers, structmembers.double_member), 0, NULL}, + {"T_STRING_INPLACE", T_STRING_INPLACE, offsetof(test_structmembers, structmembers.inplace_member), 0, NULL}, #ifdef HAVE_LONG_LONG {"T_LONGLONG", T_LONGLONG, offsetof(test_structmembers, structmembers.longlong_member), 0, NULL}, {"T_ULONGLONG", T_ULONGLONG, offsetof(test_structmembers, structmembers.ulonglong_member), 0, NULL}, @@ -2125,17 +2127,19 @@ test_structmembers_new(PyTypeObject *type, PyObject *args, PyObject *kwargs) static char *keywords[] = { "T_BOOL", "T_BYTE", "T_UBYTE", "T_SHORT", "T_USHORT", "T_INT", "T_UINT", "T_LONG", "T_ULONG", "T_PYSSIZET", - "T_FLOAT", "T_DOUBLE", + "T_FLOAT", "T_DOUBLE", "T_INPLACE_STRING", #ifdef HAVE_LONG_LONG "T_LONGLONG", "T_ULONGLONG", #endif NULL}; - static char *fmt = "|bbBhHiIlknfd" + static char *fmt = "|bbBhHiIlknfds#" #ifdef HAVE_LONG_LONG "LK" #endif ; test_structmembers *ob; + const char *s; + Py_ssize_t string_len = 0; ob = PyObject_New(test_structmembers, type); if (ob == NULL) return NULL; @@ -2152,7 +2156,8 @@ test_structmembers_new(PyTypeObject *type, PyObject *args, PyObject *kwargs) &ob->structmembers.ulong_member, &ob->structmembers.pyssizet_member, &ob->structmembers.float_member, - &ob->structmembers.double_member + &ob->structmembers.double_member, + &s, &string_len #ifdef HAVE_LONG_LONG , &ob->structmembers.longlong_member, &ob->structmembers.ulonglong_member @@ -2161,6 +2166,12 @@ test_structmembers_new(PyTypeObject *type, PyObject *args, PyObject *kwargs) Py_DECREF(ob); return NULL; } + if (string_len > 5) { + Py_DECREF(ob); + PyErr_SetString(PyExc_ValueError, "string too long"); + return NULL; + } + strcpy(ob->structmembers.inplace_member, s); return (PyObject *)ob; } diff --git a/Python/structmember.c b/Python/structmember.c index 88ea6f8..0ebd189 100644 --- a/Python/structmember.c +++ b/Python/structmember.c @@ -106,7 +106,7 @@ PyMember_SetOne(char *addr, PyMemberDef *l, PyObject *v) addr += l->offset; - if ((l->flags & READONLY) || l->type == T_STRING) + if ((l->flags & READONLY)) { PyErr_SetString(PyExc_AttributeError, "readonly attribute"); return -1; @@ -266,6 +266,10 @@ PyMember_SetOne(char *addr, PyMemberDef *l, PyObject *v) *(char*)addr = string[0]; break; } + case T_STRING: + case T_STRING_INPLACE: + PyErr_SetString(PyExc_TypeError, "readonly attribute"); + return -1; #ifdef HAVE_LONG_LONG case T_LONGLONG:{ PY_LONG_LONG value; |