diff options
author | Thomas Heller <theller@ctypes.org> | 2007-07-12 19:06:25 (GMT) |
---|---|---|
committer | Thomas Heller <theller@ctypes.org> | 2007-07-12 19:06:25 (GMT) |
commit | 60831316df8893e973f92592b7c4c95ad489ff15 (patch) | |
tree | 6e788f97e7c2874b12540a1cb30c946896efb926 /Modules | |
parent | d0762282022ebb9809e488325cf86bb71e1371c0 (diff) | |
download | cpython-60831316df8893e973f92592b7c4c95ad489ff15.zip cpython-60831316df8893e973f92592b7c4c95ad489ff15.tar.gz cpython-60831316df8893e973f92592b7c4c95ad489ff15.tar.bz2 |
Accept bytes for c_wchar_p instances and c_wchar array instances.
ctypes.create_unicode_buffer also accepts bytes now.
Revert some tests in test_unicode: Since string literals are unicode
now, conversion takes place when byte literals are passed as unicode
parameters.
Diffstat (limited to 'Modules')
-rw-r--r-- | Modules/_ctypes/_ctypes.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/_ctypes/_ctypes.c b/Modules/_ctypes/_ctypes.c index 5d4e7c5..bab1e35 100644 --- a/Modules/_ctypes/_ctypes.c +++ b/Modules/_ctypes/_ctypes.c @@ -847,7 +847,7 @@ WCharArray_set_value(CDataObject *self, PyObject *value) { Py_ssize_t result = 0; - if (PyString_Check(value)) { + if (PyBytes_Check(value)) { value = PyUnicode_FromEncodedObject(value, conversion_mode_encoding, conversion_mode_errors); @@ -1119,7 +1119,7 @@ c_wchar_p_from_param(PyObject *type, PyObject *value) Py_INCREF(Py_None); return Py_None; } - if (PyUnicode_Check(value) || PyString_Check(value)) { + if (PyUnicode_Check(value) || PyBytes_Check(value)) { PyCArgObject *parg; struct fielddesc *fd = getentry("Z"); |