summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrett Cannon <bcannon@gmail.com>2006-06-08 16:23:04 (GMT)
committerBrett Cannon <bcannon@gmail.com>2006-06-08 16:23:04 (GMT)
commit6ee7d01c059f799c0f52ffe94811507bccc688a2 (patch)
treec100a18bfb8677e207d0f9bb5cb33ae2c5459601
parent442b49e93820c2ed52192e30929f233a8546457c (diff)
downloadcpython-6ee7d01c059f799c0f52ffe94811507bccc688a2.zip
cpython-6ee7d01c059f799c0f52ffe94811507bccc688a2.tar.gz
cpython-6ee7d01c059f799c0f52ffe94811507bccc688a2.tar.bz2
Make binascii.hexlify() use s# for its arguments instead of t# to actually
match its documentation stating it accepts any read-only buffer.
-rw-r--r--Misc/NEWS3
-rw-r--r--Modules/binascii.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index fea1a6a..6c1fddb 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -75,6 +75,9 @@ Core and builtins
Extension Modules
-----------------
+- Change binascii.hexlify to accept a read-only buffer instead of only a char
+ buffer and actually follow its documentation.
+
- Fixed a potentially invalid memory access of CJKCodecs' shift-jis decoder.
- Patch #1478788 (modified version): The functional extension module has
diff --git a/Modules/binascii.c b/Modules/binascii.c
index 71a9624..3b2c8b2 100644
--- a/Modules/binascii.c
+++ b/Modules/binascii.c
@@ -909,7 +909,7 @@ binascii_hexlify(PyObject *self, PyObject *args)
char* retbuf;
Py_ssize_t i, j;
- if (!PyArg_ParseTuple(args, "t#:b2a_hex", &argbuf, &arglen))
+ if (!PyArg_ParseTuple(args, "s#:b2a_hex", &argbuf, &arglen))
return NULL;
retval = PyString_FromStringAndSize(NULL, arglen*2);