Skip to content

Commit 80d8fd8

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 a811c16 commit 80d8fd8

File tree

4 files changed

+48
-20
lines changed

4 files changed

+48
-20
lines changed

‎Lib/test/test_structmembers.py‎

Lines changed: 27 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -20,65 +20,72 @@
2020
8, # T_ULONG
2121
23, # T_PYSSIZET
2222
9.99999,# T_FLOAT
23-
10.1010101010 # T_DOUBLE
23+
10.1010101010, # T_DOUBLE
24+
"hi" # T_STRING_INPLACE
2425
)
2526

2627
class ReadWriteTests(unittest.TestCase):
27-
def test_types(self):
28+
29+
def test_bool(self):
2830
ts.T_BOOL = True
2931
self.assertEquals(ts.T_BOOL, True)
3032
ts.T_BOOL = False
3133
self.assertEquals(ts.T_BOOL, False)
3234
self.assertRaises(TypeError, setattr, ts, 'T_BOOL', 1)
3335

36+
def test_byte(self):
3437
ts.T_BYTE = CHAR_MAX
3538
self.assertEquals(ts.T_BYTE, CHAR_MAX)
3639
ts.T_BYTE = CHAR_MIN
3740
self.assertEquals(ts.T_BYTE, CHAR_MIN)
3841
ts.T_UBYTE = UCHAR_MAX
3942
self.assertEquals(ts.T_UBYTE, UCHAR_MAX)
4043

44+
def test_short(self):
4145
ts.T_SHORT = SHRT_MAX
4246
self.assertEquals(ts.T_SHORT, SHRT_MAX)
4347
ts.T_SHORT = SHRT_MIN
4448
self.assertEquals(ts.T_SHORT, SHRT_MIN)
4549
ts.T_USHORT = USHRT_MAX
4650
self.assertEquals(ts.T_USHORT, USHRT_MAX)
4751

52+
def test_int(self):
4853
ts.T_INT = INT_MAX
4954
self.assertEquals(ts.T_INT, INT_MAX)
5055
ts.T_INT = INT_MIN
5156
self.assertEquals(ts.T_INT, INT_MIN)
5257
ts.T_UINT = UINT_MAX
5358
self.assertEquals(ts.T_UINT, UINT_MAX)
5459

60+
def test_long(self):
5561
ts.T_LONG = LONG_MAX
5662
self.assertEquals(ts.T_LONG, LONG_MAX)
5763
ts.T_LONG = LONG_MIN
5864
self.assertEquals(ts.T_LONG, LONG_MIN)
5965
ts.T_ULONG = ULONG_MAX
6066
self.assertEquals(ts.T_ULONG, ULONG_MAX)
6167

68+
def test_py_ssize_t(self):
6269
ts.T_PYSSIZET = PY_SSIZE_T_MAX
6370
self.assertEquals(ts.T_PYSSIZET, PY_SSIZE_T_MAX)
6471
ts.T_PYSSIZET = PY_SSIZE_T_MIN
6572
self.assertEquals(ts.T_PYSSIZET, PY_SSIZE_T_MIN)
6673

67-
## T_LONGLONG and T_ULONGLONG may not be present on some platforms
68-
if hasattr(ts, 'T_LONGLONG'):
69-
ts.T_LONGLONG = LLONG_MAX
70-
self.assertEquals(ts.T_LONGLONG, LLONG_MAX)
71-
ts.T_LONGLONG = LLONG_MIN
72-
self.assertEquals(ts.T_LONGLONG, LLONG_MIN)
74+
@unittest.skipUnless(hasattr(ts, "T_LONGLONG"), "long long not present")
75+
def test_longlong(self):
76+
ts.T_LONGLONG = LLONG_MAX
77+
self.assertEquals(ts.T_LONGLONG, LLONG_MAX)
78+
ts.T_LONGLONG = LLONG_MIN
79+
self.assertEquals(ts.T_LONGLONG, LLONG_MIN)
7380

74-
ts.T_ULONGLONG = ULLONG_MAX
75-
self.assertEquals(ts.T_ULONGLONG, ULLONG_MAX)
81+
ts.T_ULONGLONG = ULLONG_MAX
82+
self.assertEquals(ts.T_ULONGLONG, ULLONG_MAX)
7683

77-
## make sure these will accept a plain int as well as a long
78-
ts.T_LONGLONG = 3
79-
self.assertEquals(ts.T_LONGLONG, 3)
80-
ts.T_ULONGLONG = 4
81-
self.assertEquals(ts.T_ULONGLONG, 4)
84+
## make sure these will accept a plain int as well as a long
85+
ts.T_LONGLONG = 3
86+
self.assertEquals(ts.T_LONGLONG, 3)
87+
ts.T_ULONGLONG = 4
88+
self.assertEquals(ts.T_ULONGLONG, 4)
8289

8390
def test_bad_assignments(self):
8491
# XXX testing of T_UINT and T_ULONG temporarily disabled;
@@ -91,7 +98,6 @@ def test_bad_assignments(self):
9198
'T_LONG', 'T_ULONG',
9299
'T_PYSSIZET'
93100
]
94-
95101
if hasattr(ts, 'T_LONGLONG'):
96102
integer_attributes.extend(['T_LONGLONG', 'T_ULONGLONG'])
97103

@@ -101,6 +107,11 @@ def test_bad_assignments(self):
101107
for attr in integer_attributes:
102108
self.assertRaises(TypeError, setattr, ts, attr, nonint)
103109

110+
def test_inplace_string(self):
111+
self.assertEquals(ts.T_STRING_INPLACE, "hi")
112+
self.assertRaises(TypeError, setattr, ts, "T_STRING_INPLACE", "s")
113+
self.assertRaises(TypeError, delattr, ts, "T_STRING_INPLACE")
114+
104115

105116
class TestWarnings(unittest.TestCase):
106117

‎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 3.2 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 #8211: Save/restore CFLAGS around AC_PROG_CC in configure.in, compiler
1618
optimizations are disabled when --with-pydebug is used.
1719

‎Modules/_testcapimodule.c‎

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2087,6 +2087,7 @@ typedef struct {
20872087
Py_ssize_t pyssizet_member;
20882088
float float_member;
20892089
double double_member;
2090+
char inplace_member[5];
20902091
#ifdef HAVE_LONG_LONG
20912092
PY_LONG_LONG longlong_member;
20922093
unsigned PY_LONG_LONG ulonglong_member;
@@ -2111,6 +2112,7 @@ static struct PyMemberDef test_members[] = {
21112112
{"T_PYSSIZET", T_PYSSIZET, offsetof(test_structmembers, structmembers.pyssizet_member), 0, NULL},
21122113
{"T_FLOAT", T_FLOAT, offsetof(test_structmembers, structmembers.float_member), 0, NULL},
21132114
{"T_DOUBLE", T_DOUBLE, offsetof(test_structmembers, structmembers.double_member), 0, NULL},
2115+
{"T_STRING_INPLACE", T_STRING_INPLACE, offsetof(test_structmembers, structmembers.inplace_member), 0, NULL},
21142116
#ifdef HAVE_LONG_LONG
21152117
{"T_LONGLONG", T_LONGLONG, offsetof(test_structmembers, structmembers.longlong_member), 0, NULL},
21162118
{"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)
21252127
static char *keywords[] = {
21262128
"T_BOOL", "T_BYTE", "T_UBYTE", "T_SHORT", "T_USHORT",
21272129
"T_INT", "T_UINT", "T_LONG", "T_ULONG", "T_PYSSIZET",
2128-
"T_FLOAT", "T_DOUBLE",
2130+
"T_FLOAT", "T_DOUBLE", "T_INPLACE_STRING",
21292131
#ifdef HAVE_LONG_LONG
21302132
"T_LONGLONG", "T_ULONGLONG",
21312133
#endif
21322134
NULL};
2133-
static char *fmt = "|bbBhHiIlknfd"
2135+
static char *fmt = "|bbBhHiIlknfds#"
21342136
#ifdef HAVE_LONG_LONG
21352137
"LK"
21362138
#endif
21372139
;
21382140
test_structmembers *ob;
2141+
const char *s;
2142+
Py_ssize_t string_len = 0;
21392143
ob = PyObject_New(test_structmembers, type);
21402144
if (ob == NULL)
21412145
return NULL;
@@ -2152,7 +2156,8 @@ test_structmembers_new(PyTypeObject *type, PyObject *args, PyObject *kwargs)
21522156
&ob->structmembers.ulong_member,
21532157
&ob->structmembers.pyssizet_member,
21542158
&ob->structmembers.float_member,
2155-
&ob->structmembers.double_member
2159+
&ob->structmembers.double_member,
2160+
&s, &string_len
21562161
#ifdef HAVE_LONG_LONG
21572162
, &ob->structmembers.longlong_member,
21582163
&ob->structmembers.ulonglong_member
@@ -2161,6 +2166,12 @@ test_structmembers_new(PyTypeObject *type, PyObject *args, PyObject *kwargs)
21612166
Py_DECREF(ob);
21622167
return NULL;
21632168
}
2169+
if (string_len > 5) {
2170+
Py_DECREF(ob);
2171+
PyErr_SetString(PyExc_ValueError, "string too long");
2172+
return NULL;
2173+
}
2174+
strcpy(ob->structmembers.inplace_member, s);
21642175
return (PyObject *)ob;
21652176
}
21662177

‎Python/structmember.c‎

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

107107
addr += l->offset;
108108

109-
if ((l->flags & READONLY) || l->type == T_STRING)
109+
if ((l->flags & READONLY))
110110
{
111111
PyErr_SetString(PyExc_AttributeError, "readonly attribute");
112112
return -1;
@@ -266,6 +266,10 @@ PyMember_SetOne(char *addr, PyMemberDef *l, PyObject *v)
266266
*(char*)addr = string[0];
267267
break;
268268
}
269+
case T_STRING:
270+
case T_STRING_INPLACE:
271+
PyErr_SetString(PyExc_TypeError, "readonly attribute");
272+
return -1;
269273
#ifdef HAVE_LONG_LONG
270274
case T_LONGLONG:{
271275
PY_LONG_LONG value;

0 commit comments

Comments
 (0)