summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_structmembers.py
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 /Lib/test/test_structmembers.py
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. ........
Diffstat (limited to 'Lib/test/test_structmembers.py')
-rw-r--r--Lib/test/test_structmembers.py4
1 files changed, 2 insertions, 2 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