c_char_p.from_param accepts bytes. Fix test_parameters.

Thomas Heller · Thomas Heller · commit 3d79dd9edf3c · 2007-07-12T19:33:24.000Z
diff --git a/Lib/ctypes/test/test_parameters.py b/Lib/ctypes/test/test_parameters.py
@@ -54,11 +54,11 @@ def test_cstrings(self):
 
         # c_char_p.from_param on a Python String packs the string
         # into a cparam object
-        s = "123"
+        s = b"123"
         self.failUnless(c_char_p.from_param(s)._obj is s)
 
         # new in 0.9.1: convert (encode) unicode to ascii
-        self.failUnlessEqual(c_char_p.from_param("123")._obj, "123")
+        self.failUnlessEqual(c_char_p.from_param("123")._obj, b"123")
         self.assertRaises(UnicodeEncodeError, c_char_p.from_param, "123\377")
 
         self.assertRaises(TypeError, c_char_p.from_param, 42)
@@ -82,7 +82,7 @@ def test_cw_strings(self):
 
             # new in 0.9.1: convert (decode) ascii to unicode
             self.failUnlessEqual(c_wchar_p.from_param("123")._obj, "123")
-        self.assertRaises(UnicodeDecodeError, c_wchar_p.from_param, "123\377")
+        self.assertRaises(UnicodeDecodeError, c_wchar_p.from_param, b"123\377")
 
         pa = c_wchar_p.from_param(c_wchar_p("123"))
         self.failUnlessEqual(type(pa), c_wchar_p)
diff --git a/Modules/_ctypes/_ctypes.c b/Modules/_ctypes/_ctypes.c
@@ -1183,7 +1183,7 @@ c_char_p_from_param(PyObject *type, PyObject *value)
 		Py_INCREF(Py_None);
 		return Py_None;
 	}
-	if (PyString_Check(value) || PyUnicode_Check(value)) {
+	if (PyBytes_Check(value) || PyUnicode_Check(value)) {
 		PyCArgObject *parg;
 		struct fielddesc *fd = getentry("z");
 

Original file line number	Diff line number	Diff line change
`@@ -1183,7 +1183,7 @@ c_char_p_from_param(PyObject type, PyObject value)`
`1183`	`1183`	`Py_INCREF(Py_None);`
`1184`	`1184`	`return Py_None;`
`1185`	`1185`	`}`
`1186`		`- if (PyString_Check(value) \|\| PyUnicode_Check(value)) {`
	`1186`	`+ if (PyBytes_Check(value) \|\| PyUnicode_Check(value)) {`
`1187`	`1187`	`PyCArgObject *parg;`
`1188`	`1188`	`struct fielddesc *fd = getentry("z");`
`1189`	`1189`