summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Dickinson <dickinsm@gmail.com>2010-04-03 10:49:56 (GMT)
committerMark Dickinson <dickinsm@gmail.com>2010-04-03 10:49:56 (GMT)
commit5fc16b469ea96f1db11bb2fc9996ac056e8e1c3c (patch)
treedd5f9a1f0db64b13eeda0e19df7f1f3bdb0b4510
parent9c01e441bb2589853446787d4150fe623050a1e1 (diff)
downloadcpython-5fc16b469ea96f1db11bb2fc9996ac056e8e1c3c.zip
cpython-5fc16b469ea96f1db11bb2fc9996ac056e8e1c3c.tar.gz
cpython-5fc16b469ea96f1db11bb2fc9996ac056e8e1c3c.tar.bz2
Merged revisions 79661 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r79661 | mark.dickinson | 2010-04-03 11:27:05 +0100 (Sat, 03 Apr 2010) | 14 lines Fix a couple of issues with the test_structmembersType class in _testcapimodule - rename to _test_structmembersType to avoid the class being automatically called by test_capi - allow space for trailing NUL in inplace_member field of all_structmembers - use T_STRING_INPLACE instead of T_INPLACE_STRING as keyword argument to _test_structmembersType initializer - don't attempt to initialize inplace_member field if T_STRING_INPLACE argument wasn't supplied. ........
-rw-r--r--Lib/test/test_structmembers.py4
-rw-r--r--Modules/_testcapimodule.c25
2 files changed, 18 insertions, 11 deletions
diff --git a/Lib/test/test_structmembers.py b/Lib/test/test_structmembers.py
index 4eba7f0..f9e3a3d 100644
--- a/Lib/test/test_structmembers.py
+++ b/Lib/test/test_structmembers.py
@@ -1,4 +1,4 @@
-from _testcapi import test_structmembersType, \
+from _testcapi import _test_structmembersType, \
CHAR_MAX, CHAR_MIN, UCHAR_MAX, \
SHRT_MAX, SHRT_MIN, USHRT_MAX, \
INT_MAX, INT_MIN, UINT_MAX, \
@@ -9,7 +9,7 @@ from _testcapi import test_structmembersType, \
import unittest
from test import support
-ts=test_structmembersType(False, # T_BOOL
+ts=_test_structmembersType(False, # T_BOOL
1, # T_BYTE
2, # T_UBYTE
3, # T_SHORT
diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c
index 87f9d8b..ea0b1c7 100644
--- a/Modules/_testcapimodule.c
+++ b/Modules/_testcapimodule.c
@@ -2087,7 +2087,7 @@ typedef struct {
Py_ssize_t pyssizet_member;
float float_member;
double double_member;
- char inplace_member[5];
+ char inplace_member[6];
#ifdef HAVE_LONG_LONG
PY_LONG_LONG longlong_member;
unsigned PY_LONG_LONG ulonglong_member;
@@ -2127,7 +2127,7 @@ 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_INPLACE_STRING",
+ "T_FLOAT", "T_DOUBLE", "T_STRING_INPLACE",
#ifdef HAVE_LONG_LONG
"T_LONGLONG", "T_ULONGLONG",
#endif
@@ -2138,7 +2138,7 @@ test_structmembers_new(PyTypeObject *type, PyObject *args, PyObject *kwargs)
#endif
;
test_structmembers *ob;
- const char *s;
+ const char *s = NULL;
Py_ssize_t string_len = 0;
ob = PyObject_New(test_structmembers, type);
if (ob == NULL)
@@ -2166,12 +2166,17 @@ 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;
+ if (s != NULL) {
+ if (string_len > 5) {
+ Py_DECREF(ob);
+ PyErr_SetString(PyExc_ValueError, "string too long");
+ return NULL;
+ }
+ strcpy(ob->structmembers.inplace_member, s);
+ }
+ else {
+ strcpy(ob->structmembers.inplace_member, "");
}
- strcpy(ob->structmembers.inplace_member, s);
return (PyObject *)ob;
}
@@ -2250,7 +2255,9 @@ PyInit__testcapi(void)
Py_TYPE(&test_structmembersType)=&PyType_Type;
Py_INCREF(&test_structmembersType);
- PyModule_AddObject(m, "test_structmembersType", (PyObject *)&test_structmembersType);
+ /* don't use a name starting with "test", since we don't want
+ test_capi to automatically call this */
+ PyModule_AddObject(m, "_test_structmembersType", (PyObject *)&test_structmembersType);
PyModule_AddObject(m, "CHAR_MAX", PyLong_FromLong(CHAR_MAX));
PyModule_AddObject(m, "CHAR_MIN", PyLong_FromLong(CHAR_MIN));