summaryrefslogtreecommitdiffstats
path: root/Lib/ctypes
diff options
context:
space:
mode:
authorThomas Heller <theller@ctypes.org>2009-09-18 20:08:39 (GMT)
committerThomas Heller <theller@ctypes.org>2009-09-18 20:08:39 (GMT)
commit69b639f9464d4f9d4b9303d218a2f8bfc8269591 (patch)
tree631bac786c00fe2a0c1ffa554957e11f01fd8ea7 /Lib/ctypes
parentd7cb1b9119beab9a4ffb627bd65cf9e287d32b66 (diff)
downloadcpython-69b639f9464d4f9d4b9303d218a2f8bfc8269591.zip
cpython-69b639f9464d4f9d4b9303d218a2f8bfc8269591.tar.gz
cpython-69b639f9464d4f9d4b9303d218a2f8bfc8269591.tar.bz2
Merged revisions 74921 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r74921 | thomas.heller | 2009-09-18 22:05:44 +0200 (Fr, 18 Sep 2009) | 3 lines Issue #4606: Passing 'None' if ctypes argtype is set to POINTER(...) does now always result in NULL. ........
Diffstat (limited to 'Lib/ctypes')
-rw-r--r--Lib/ctypes/test/test_parameters.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/ctypes/test/test_parameters.py b/Lib/ctypes/test/test_parameters.py
index 10eddd4..6a3f33d 100644
--- a/Lib/ctypes/test/test_parameters.py
+++ b/Lib/ctypes/test/test_parameters.py
@@ -97,7 +97,7 @@ class SimpleTypesTestCase(unittest.TestCase):
self.assertEqual(x.contents.value, 42)
self.assertEqual(LPINT(c_int(42)).contents.value, 42)
- self.assertEqual(LPINT.from_param(None), 0)
+ self.assertEqual(LPINT.from_param(None), None)
if c_int != c_long:
self.assertRaises(TypeError, LPINT.from_param, pointer(c_long(42)))