Rooba
/
cpython
mirror of https://github.com/python/cpython.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- Issue #13840: Fix ctypes.create_string_buffer exception message and docs.

This commit is contained in:
Meador Inge 2012-01-26 08:44:00 -06:00
parent eaac4f0d30
commit 65992c1c01
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Doc/library/ctypes.rst
View File

@ -1815,8 +1815,6 @@ Utility functions
termination character. An integer can be passed as second argument which allows termination character. An integer can be passed as second argument which allows
to specify the size of the array if the length of the bytes should not be used. to specify the size of the array if the length of the bytes should not be used.
If the first parameter is a string, it is converted into a bytes object
according to ctypes conversion rules.
.. function:: create_unicode_buffer(init_or_size, size=None) .. function:: create_unicode_buffer(init_or_size, size=None)
@ -1833,8 +1831,6 @@ Utility functions
allows to specify the size of the array if the length of the string should not allows to specify the size of the array if the length of the string should not
be used. be used.
If the first parameter is a bytes object, it is converted into an unicode string
according to ctypes conversion rules.
.. function:: DllCanUnloadNow() .. function:: DllCanUnloadNow()

3
Misc/NEWS
View File

@ -402,6 +402,9 @@ Tests
Extension Modules Extension Modules
----------------- -----------------
- Issue #13840: The error message produced by ctypes.create_string_buffer
when given a Unicode string has been fixed.
- Issue #9975: socket: Fix incorrect use of flowinfo and scope_id. Patch by - Issue #9975: socket: Fix incorrect use of flowinfo and scope_id. Patch by
Vilmos Nebehaj. Vilmos Nebehaj.

2
Modules/_ctypes/_ctypes.c
View File

@ -1096,7 +1096,7 @@ CharArray_set_value(CDataObject *self, PyObject *value)
if (!PyBytes_Check(value)) { if (!PyBytes_Check(value)) {
PyErr_Format(PyExc_TypeError, PyErr_Format(PyExc_TypeError,
"str/bytes expected instead of %s instance", "bytes expected instead of %s instance",
Py_TYPE(value)->tp_name); Py_TYPE(value)->tp_name);
return -1; return -1;
} else } else