Merged revisions 74921 via svnmerge from

Thomas Heller · Thomas Heller · commit 69b639f9464d · 2009-09-18T20:08:39.000Z
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. ........
diff --git a/Lib/ctypes/test/test_parameters.py b/Lib/ctypes/test/test_parameters.py
@@ -97,7 +97,7 @@ def test_int_pointers(self):
         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)))
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -72,6 +72,9 @@ C-API
 Library
 -------
 
+- Issue #4606: Passing 'None' if ctypes argtype is set to POINTER(...)
+  does now always result in NULL.
+
 - Issue #5042: Structure sub-subclass does now initialize correctly
   with base class positional arguments.
 
diff --git a/Modules/_ctypes/_ctypes.c b/Modules/_ctypes/_ctypes.c
@@ -936,8 +936,11 @@ PyCPointerType_from_param(PyObject *type, PyObject *value)
 {
 	StgDictObject *typedict;
 
-	if (value == Py_None)
-		return PyLong_FromLong(0); /* NULL pointer */
+	if (value == Py_None) {
+		/* ConvParam will convert to a NULL pointer later */
+		Py_INCREF(value);
+		return value;
+	}
 
 	typedict = PyType_stgdict(type);
 	assert(typedict); /* Cannot be NULL for pointer types */
diff --git a/Modules/_ctypes/callproc.c b/Modules/_ctypes/callproc.c
@@ -547,6 +547,7 @@ PyTypeObject PyCArg_Type = {
  * C function call.
  *
  * 1. Python integers are converted to C int and passed by value.
+ *    Py_None is converted to a C NULL pointer.
  *
  * 2. 3-tuples are expected to have a format character in the first
  *    item, which must be 'i', 'f', 'd', 'q', or 'P'.

Original file line number	Diff line number	Diff line change
`@@ -547,6 +547,7 @@ PyTypeObject PyCArg_Type = {`
`547`	`547`	`* C function call.`
`548`	`548`	`*`
`549`	`549`	`* 1. Python integers are converted to C int and passed by value.`
	`550`	`+ * Py_None is converted to a C NULL pointer.`
`550`	`551`	`*`
`551`	`552`	`* 2. 3-tuples are expected to have a format character in the first`
`552`	`553`	`* item, which must be 'i', 'f', 'd', 'q', or 'P'.`