From 498289ef28284d99bd0d73bf3349c17977308693 Mon Sep 17 00:00:00 2001 From: Benjamin Peterson Date: Sat, 3 Apr 2010 01:40:44 +0000 Subject: [PATCH] Merged revisions 79642,79644 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r79642 | benjamin.peterson | 2010-04-02 20:08:34 -0500 (Fri, 02 Apr 2010) | 1 line split out large test function ........ r79644 | benjamin.peterson | 2010-04-02 20:28:57 -0500 (Fri, 02 Apr 2010) | 1 line give TypeError when trying to set T_STRING_INPLACE ........ --- Lib/test/test_structmembers.py | 40 +++++++++++++++++++++------------- Misc/NEWS | 2 ++ Modules/_testcapimodule.c | 17 ++++++++++++--- Python/structmember.c | 6 ++++- 4 files changed, 46 insertions(+), 19 deletions(-) diff --git a/Lib/test/test_structmembers.py b/Lib/test/test_structmembers.py index c196cc51474..b8ee6bdb098 100644 --- a/Lib/test/test_structmembers.py +++ b/Lib/test/test_structmembers.py @@ -9,16 +9,18 @@ import warnings, exceptions, unittest, sys from test import test_support ts=test_structmembersType(False, 1, 2, 3, 4, 5, 6, 7, 8, - 9.99999, 10.1010101010) + 9.99999, 10.1010101010, "hi") 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 @@ -26,6 +28,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 @@ -33,6 +36,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 @@ -40,6 +44,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 @@ -47,21 +52,26 @@ class ReadWriteTests(unittest.TestCase): ts.T_ULONG = ULONG_MAX self.assertEquals(ts.T_ULONG, ULONG_MAX) - ## 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_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): diff --git a/Misc/NEWS b/Misc/NEWS index ee23d24327d..be40f9f9fdd 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -12,6 +12,8 @@ What's New in Python 2.6.6 alpha 1? Core and Builtins ----------------- +- Raise a TypeError when trying to delete a T_STRING_INPLACE struct member. + - Issue #1583863: An unicode subclass can now override the __unicode__ method - Issue #7544: Preallocate thread memory before creating the thread to avoid diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c index 238e4947018..b6ba0f3c7d0 100644 --- a/Modules/_testcapimodule.c +++ b/Modules/_testcapimodule.c @@ -969,6 +969,7 @@ typedef struct { unsigned long ulong_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; @@ -992,6 +993,7 @@ static struct PyMemberDef test_members[] = { {"T_ULONG", T_ULONG, offsetof(test_structmembers, structmembers.ulong_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}, @@ -1006,17 +1008,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_FLOAT", "T_DOUBLE", + "T_FLOAT", "T_DOUBLE", "T_INPLACE_STRING", #ifdef HAVE_LONG_LONG "T_LONGLONG", "T_ULONGLONG", #endif NULL}; - static char *fmt = "|bbBhHiIlkfd" + static char *fmt = "|bbBhHiIlkfds#" #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; @@ -1032,7 +1036,8 @@ test_structmembers_new(PyTypeObject *type, PyObject *args, PyObject *kwargs) &ob->structmembers.long_member, &ob->structmembers.ulong_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 @@ -1041,6 +1046,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 9f87c076e3d..d2efd14f5d8 100644 --- a/Python/structmember.c +++ b/Python/structmember.c @@ -172,7 +172,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_TypeError, "readonly attribute"); return -1; @@ -328,6 +328,10 @@ PyMember_SetOne(char *addr, PyMemberDef *l, PyObject *v) return -1; } 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;