summaryrefslogtreecommitdiffstats
path: root/Python/getargs.c
diff options
context:
space:
mode:
authorEli Bendersky <eliben@gmail.com>2011-07-29 04:05:08 (GMT)
committerEli Bendersky <eliben@gmail.com>2011-07-29 04:05:08 (GMT)
commit906b88fb2a52725e78deeb8076a52671107e2af1 (patch)
treeb3a9397d8e65a13d275731f7447088389c0a3526 /Python/getargs.c
parent66d2be898611f32e3840025055f2cd9b92b9f19c (diff)
downloadcpython-906b88fb2a52725e78deeb8076a52671107e2af1.zip
cpython-906b88fb2a52725e78deeb8076a52671107e2af1.tar.gz
cpython-906b88fb2a52725e78deeb8076a52671107e2af1.tar.bz2
Issue #12380: PyArg_ParseTuple now accepts a bytearray for the 'c' format.
As a side effect, this now allows the rjust, ljust and center methods of bytes and bytearray to accept a bytearray argument. Patch by Petri Lehtinen
Diffstat (limited to 'Python/getargs.c')
-rw-r--r--Python/getargs.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/Python/getargs.c b/Python/getargs.c
index 4b57153..c3da368 100644
--- a/Python/getargs.c
+++ b/Python/getargs.c
@@ -828,6 +828,8 @@ convertsimple(PyObject *arg, const char **p_format, va_list *p_va, int flags,
char *p = va_arg(*p_va, char *);
if (PyBytes_Check(arg) && PyBytes_Size(arg) == 1)
*p = PyBytes_AS_STRING(arg)[0];
+ else if (PyByteArray_Check(arg) && PyByteArray_Size(arg) == 1)
+ *p = PyByteArray_AS_STRING(arg)[0];
else
return converterr("a byte string of length 1", arg, msgbuf, bufsize);
break;