Skip to content

Commit 498289e

Browse files
benjaminpbenjaminp
committed
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 ........
1 parent 8d837ab commit 498289e

4 files changed

Lines changed: 48 additions & 21 deletions

File tree

‎Lib/test/test_structmembers.py‎

Lines changed: 27 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -9,59 +9,69 @@
99
from test import test_support
1010

1111
ts=test_structmembersType(False, 1, 2, 3, 4, 5, 6, 7, 8,
12-
9.99999, 10.1010101010)
12+
9.99999, 10.1010101010, "hi")
1313

1414
class ReadWriteTests(unittest.TestCase):
15-
def test_types(self):
15+
16+
def test_bool(self):
1617
ts.T_BOOL = True
1718
self.assertEquals(ts.T_BOOL, True)
1819
ts.T_BOOL = False
1920
self.assertEquals(ts.T_BOOL, False)
2021
self.assertRaises(TypeError, setattr, ts, 'T_BOOL', 1)
2122

23+
def test_byte(self):
2224
ts.T_BYTE = CHAR_MAX
2325
self.assertEquals(ts.T_BYTE, CHAR_MAX)
2426
ts.T_BYTE = CHAR_MIN
2527
self.assertEquals(ts.T_BYTE, CHAR_MIN)
2628
ts.T_UBYTE = UCHAR_MAX
2729
self.assertEquals(ts.T_UBYTE, UCHAR_MAX)
2830

31+
def test_short(self):
2932
ts.T_SHORT = SHRT_MAX
3033
self.assertEquals(ts.T_SHORT, SHRT_MAX)
3134
ts.T_SHORT = SHRT_MIN
3235
self.assertEquals(ts.T_SHORT, SHRT_MIN)
3336
ts.T_USHORT = USHRT_MAX
3437
self.assertEquals(ts.T_USHORT, USHRT_MAX)
3538

39+
def test_int(self):
3640
ts.T_INT = INT_MAX
3741
self.assertEquals(ts.T_INT, INT_MAX)
3842
ts.T_INT = INT_MIN
3943
self.assertEquals(ts.T_INT, INT_MIN)
4044
ts.T_UINT = UINT_MAX
4145
self.assertEquals(ts.T_UINT, UINT_MAX)
4246

47+
def test_long(self):
4348
ts.T_LONG = LONG_MAX
4449
self.assertEquals(ts.T_LONG, LONG_MAX)
4550
ts.T_LONG = LONG_MIN
4651
self.assertEquals(ts.T_LONG, LONG_MIN)
4752
ts.T_ULONG = ULONG_MAX
4853
self.assertEquals(ts.T_ULONG, ULONG_MAX)
4954

50-
## T_LONGLONG and T_ULONGLONG may not be present on some platforms
51-
if hasattr(ts, 'T_LONGLONG'):
52-
ts.T_LONGLONG = LLONG_MAX
53-
self.assertEquals(ts.T_LONGLONG, LLONG_MAX)
54-
ts.T_LONGLONG = LLONG_MIN
55-
self.assertEquals(ts.T_LONGLONG, LLONG_MIN)
56-
57-
ts.T_ULONGLONG = ULLONG_MAX
58-
self.assertEquals(ts.T_ULONGLONG, ULLONG_MAX)
59-
60-
## make sure these will accept a plain int as well as a long
61-
ts.T_LONGLONG = 3
62-
self.assertEquals(ts.T_LONGLONG, 3)
63-
ts.T_ULONGLONG = 4
64-
self.assertEquals(ts.T_ULONGLONG, 4)
55+
@unittest.skipUnless(hasattr(ts, "T_LONGLONG"), "long long not present")
56+
def test_longlong(self):
57+
ts.T_LONGLONG = LLONG_MAX
58+
self.assertEquals(ts.T_LONGLONG, LLONG_MAX)
59+
ts.T_LONGLONG = LLONG_MIN
60+
self.assertEquals(ts.T_LONGLONG, LLONG_MIN)
61+
62+
ts.T_ULONGLONG = ULLONG_MAX
63+
self.assertEquals(ts.T_ULONGLONG, ULLONG_MAX)
64+
65+
## make sure these will accept a plain int as well as a long
66+
ts.T_LONGLONG = 3
67+
self.assertEquals(ts.T_LONGLONG, 3)
68+
ts.T_ULONGLONG = 4
69+
self.assertEquals(ts.T_ULONGLONG, 4)
70+
71+
def test_inplace_string(self):
72+
self.assertEquals(ts.T_STRING_INPLACE, "hi")
73+
self.assertRaises(TypeError, setattr, ts, "T_STRING_INPLACE", "s")
74+
self.assertRaises(TypeError, delattr, ts, "T_STRING_INPLACE")
6575

6676

6777
class TestWarnings(unittest.TestCase):

‎Misc/NEWS‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ What's New in Python 2.6.6 alpha 1?
1212
Core and Builtins
1313
-----------------
1414

15+
- Raise a TypeError when trying to delete a T_STRING_INPLACE struct member.
16+
1517
- Issue #1583863: An unicode subclass can now override the __unicode__ method
1618

1719
- Issue #7544: Preallocate thread memory before creating the thread to avoid

‎Modules/_testcapimodule.c‎

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -969,6 +969,7 @@ typedef struct {
969969
unsigned long ulong_member;
970970
float float_member;
971971
double double_member;
972+
char inplace_member[5];
972973
#ifdef HAVE_LONG_LONG
973974
PY_LONG_LONG longlong_member;
974975
unsigned PY_LONG_LONG ulonglong_member;
@@ -992,6 +993,7 @@ static struct PyMemberDef test_members[] = {
992993
{"T_ULONG", T_ULONG, offsetof(test_structmembers, structmembers.ulong_member), 0, NULL},
993994
{"T_FLOAT", T_FLOAT, offsetof(test_structmembers, structmembers.float_member), 0, NULL},
994995
{"T_DOUBLE", T_DOUBLE, offsetof(test_structmembers, structmembers.double_member), 0, NULL},
996+
{"T_STRING_INPLACE", T_STRING_INPLACE, offsetof(test_structmembers, structmembers.inplace_member), 0, NULL},
995997
#ifdef HAVE_LONG_LONG
996998
{"T_LONGLONG", T_LONGLONG, offsetof(test_structmembers, structmembers.longlong_member), 0, NULL},
997999
{"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)
10061008
static char *keywords[] = {
10071009
"T_BOOL", "T_BYTE", "T_UBYTE", "T_SHORT", "T_USHORT",
10081010
"T_INT", "T_UINT", "T_LONG", "T_ULONG",
1009-
"T_FLOAT", "T_DOUBLE",
1011+
"T_FLOAT", "T_DOUBLE", "T_INPLACE_STRING",
10101012
#ifdef HAVE_LONG_LONG
10111013
"T_LONGLONG", "T_ULONGLONG",
10121014
#endif
10131015
NULL};
1014-
static char *fmt = "|bbBhHiIlkfd"
1016+
static char *fmt = "|bbBhHiIlkfds#"
10151017
#ifdef HAVE_LONG_LONG
10161018
"LK"
10171019
#endif
10181020
;
10191021
test_structmembers *ob;
1022+
const char *s;
1023+
Py_ssize_t string_len = 0;
10201024
ob = PyObject_New(test_structmembers, type);
10211025
if (ob == NULL)
10221026
return NULL;
@@ -1032,7 +1036,8 @@ test_structmembers_new(PyTypeObject *type, PyObject *args, PyObject *kwargs)
10321036
&ob->structmembers.long_member,
10331037
&ob->structmembers.ulong_member,
10341038
&ob->structmembers.float_member,
1035-
&ob->structmembers.double_member
1039+
&ob->structmembers.double_member,
1040+
&s, &string_len
10361041
#ifdef HAVE_LONG_LONG
10371042
, &ob->structmembers.longlong_member,
10381043
&ob->structmembers.ulonglong_member
@@ -1041,6 +1046,12 @@ test_structmembers_new(PyTypeObject *type, PyObject *args, PyObject *kwargs)
10411046
Py_DECREF(ob);
10421047
return NULL;
10431048
}
1049+
if (string_len > 5) {
1050+
Py_DECREF(ob);
1051+
PyErr_SetString(PyExc_ValueError, "string too long");
1052+
return NULL;
1053+
}
1054+
strcpy(ob->structmembers.inplace_member, s);
10441055
return (PyObject *)ob;
10451056
}
10461057

‎Python/structmember.c‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ PyMember_SetOne(char *addr, PyMemberDef *l, PyObject *v)
172172

173173
addr += l->offset;
174174

175-
if ((l->flags & READONLY) || l->type == T_STRING)
175+
if ((l->flags & READONLY))
176176
{
177177
PyErr_SetString(PyExc_TypeError, "readonly attribute");
178178
return -1;
@@ -328,6 +328,10 @@ PyMember_SetOne(char *addr, PyMemberDef *l, PyObject *v)
328328
return -1;
329329
}
330330
break;
331+
case T_STRING:
332+
case T_STRING_INPLACE:
333+
PyErr_SetString(PyExc_TypeError, "readonly attribute");
334+
return -1;
331335
#ifdef HAVE_LONG_LONG
332336
case T_LONGLONG:{
333337
PY_LONG_LONG value;

0 commit comments

Comments
 (0)