summaryrefslogtreecommitdiffstats
path: root/Lib/ctypes
diff options
context:
space:
mode:
authorThomas Heller <theller@ctypes.org>2009-09-18 20:09:57 (GMT)
committerThomas Heller <theller@ctypes.org>2009-09-18 20:09:57 (GMT)
commit49ac2ac740d4bc4a3b31986535638cd8f86ecec1 (patch)
treef789c276f10701ac253859c1a05e602a3662937c /Lib/ctypes
parent35888e2b3c0c36e6a6286416a60324da14b5560e (diff)
downloadcpython-49ac2ac740d4bc4a3b31986535638cd8f86ecec1.zip
cpython-49ac2ac740d4bc4a3b31986535638cd8f86ecec1.tar.gz
cpython-49ac2ac740d4bc4a3b31986535638cd8f86ecec1.tar.bz2
Merged revisions 74922 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r74922 | thomas.heller | 2009-09-18 22:08:39 +0200 (Fr, 18 Sep 2009) | 10 lines 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)))