From 3821e31d19343ff8694f6e2c86c12c0dcd127527 Mon Sep 17 00:00:00 2001 From: Thomas Heller Date: Thu, 12 Jul 2007 19:38:33 +0000 Subject: c_void_p.from_param accepts bytes. Fix test_prototypes. --- Lib/ctypes/test/test_prototypes.py | 2 +- Modules/_ctypes/_ctypes.c | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/Lib/ctypes/test/test_prototypes.py b/Lib/ctypes/test/test_prototypes.py index b14d2d8..91b7e0d 100644 --- a/Lib/ctypes/test/test_prototypes.py +++ b/Lib/ctypes/test/test_prototypes.py @@ -104,7 +104,7 @@ class CharPointersTestCase(unittest.TestCase): func.argtypes = c_void_p, self.failUnlessEqual(None, func(None)) - self.failUnlessEqual("123", func("123")) + self.failUnlessEqual("123", func(b"123")) self.failUnlessEqual("123", func(c_char_p("123"))) self.failUnlessEqual(None, func(c_char_p(None))) diff --git a/Modules/_ctypes/_ctypes.c b/Modules/_ctypes/_ctypes.c index d6a435d..5b11480 100644 --- a/Modules/_ctypes/_ctypes.c +++ b/Modules/_ctypes/_ctypes.c @@ -1268,6 +1268,7 @@ c_void_p_from_param(PyObject *type, PyObject *value) } return (PyObject *)parg; } + /* XXX struni: remove later */ /* string */ if (PyString_Check(value)) { PyCArgObject *parg; @@ -1285,6 +1286,23 @@ c_void_p_from_param(PyObject *type, PyObject *value) } return (PyObject *)parg; } +/* bytes */ + if (PyBytes_Check(value)) { + PyCArgObject *parg; + struct fielddesc *fd = getentry("z"); + + parg = new_CArgObject(); + if (parg == NULL) + return NULL; + parg->pffi_type = &ffi_type_pointer; + parg->tag = 'z'; + parg->obj = fd->setfunc(&parg->value, value, 0); + if (parg->obj == NULL) { + Py_DECREF(parg); + return NULL; + } + return (PyObject *)parg; + } /* unicode */ if (PyUnicode_Check(value)) { PyCArgObject *parg; -- cgit v0.12