(original) (raw)

changeset: 71543:536fccc75f5a user: Eli Bendersky eliben@gmail.com date: Fri Jul 29 07:05:08 2011 +0300 files: Doc/c-api/arg.rst Lib/test/test_bytes.py Lib/test/test_getargs2.py Misc/NEWS Modules/_testcapimodule.c Python/getargs.c description: 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 diff -r ccce01988603 -r 536fccc75f5a Doc/c-api/arg.rst --- a/Doc/c-api/arg.rst Thu Jul 28 09:55:13 2011 -0700 +++ b/Doc/c-api/arg.rst Fri Jul 29 07:05:08 2011 +0300 @@ -260,9 +260,11 @@ ``n`` (:class:`int`) [Py_ssize_t] Convert a Python integer to a C :c:type:`Py_ssize_t`. -``c`` (:class:`bytes` of length 1) [char] - Convert a Python byte, represented as a :class:`bytes` object of length 1, - to a C :c:type:`char`. +``c`` (:class:`bytes` or :class:`bytearray` of length 1) [char] + Convert a Python byte, represented as a :class:`bytes` or + :class:`bytearray` object of length 1, to a C :c:type:`char`. + + .. versionchanged:: 3.3 Allow :class:`bytearray` objects ``C`` (:class:`str` of length 1) [int] Convert a Python character, represented as a :class:`str` object of diff -r ccce01988603 -r 536fccc75f5a Lib/test/test_bytes.py --- a/Lib/test/test_bytes.py Thu Jul 28 09:55:13 2011 -0700 +++ b/Lib/test/test_bytes.py Fri Jul 29 07:05:08 2011 +0300 @@ -475,6 +475,27 @@ self.assertRaises(TypeError, self.type2test(b'abc').lstrip, 'b') self.assertRaises(TypeError, self.type2test(b'abc').rstrip, 'b') + def test_center(self): + # Fill character can be either bytes or bytearray (issue 12380) + b = self.type2test(b'abc') + for fill_type in (bytes, bytearray): + self.assertEqual(b.center(7, fill_type(b'-')), + self.type2test(b'--abc--')) + + def test_ljust(self): + # Fill character can be either bytes or bytearray (issue 12380) + b = self.type2test(b'abc') + for fill_type in (bytes, bytearray): + self.assertEqual(b.ljust(7, fill_type(b'-')), + self.type2test(b'abc----')) + + def test_rjust(self): + # Fill character can be either bytes or bytearray (issue 12380) + b = self.type2test(b'abc') + for fill_type in (bytes, bytearray): + self.assertEqual(b.rjust(7, fill_type(b'-')), + self.type2test(b'----abc')) + def test_ord(self): b = self.type2test(b'\0A\x7f\x80\xff') self.assertEqual([ord(b[i:i+1]) for i in range(len(b))], diff -r ccce01988603 -r 536fccc75f5a Lib/test/test_getargs2.py --- a/Lib/test/test_getargs2.py Thu Jul 28 09:55:13 2011 -0700 +++ b/Lib/test/test_getargs2.py Fri Jul 29 07:05:08 2011 +0300 @@ -294,6 +294,15 @@ self.fail('TypeError should have been raised') class Bytes_TestCase(unittest.TestCase): + def test_c(self): + from _testcapi import getargs_c + self.assertRaises(TypeError, getargs_c, b'abc') # len > 1 + self.assertEqual(getargs_c(b'a'), b'a') + self.assertEqual(getargs_c(bytearray(b'a')), b'a') + self.assertRaises(TypeError, getargs_c, memoryview(b'a')) + self.assertRaises(TypeError, getargs_c, 's') + self.assertRaises(TypeError, getargs_c, None) + def test_s(self): from _testcapi import getargs_s self.assertEqual(getargs_s('abc\xe9'), b'abc\xc3\xa9') diff -r ccce01988603 -r 536fccc75f5a Misc/NEWS --- a/Misc/NEWS Thu Jul 28 09:55:13 2011 -0700 +++ b/Misc/NEWS Fri Jul 29 07:05:08 2011 +0300 @@ -238,6 +238,9 @@ - Issue #11386: bytearray.pop() now throws IndexError when the bytearray is empty, instead of OverflowError. +- Issue #12380: The rjust, ljust and center methods of bytes and bytearray + now accept a bytearray argument. + Library ------- @@ -1282,6 +1285,8 @@ - Issue #12173: The first argument of PyImport_ImportModuleLevel is now `const char *` instead of `char *`. +- Issue #12380: PyArg_ParseTuple now accepts a bytearray for the 'c' format. + Documentation ------------- @@ -6680,4 +6685,4 @@ ---- -**(For information about older versions, consult the HISTORY file.)** \ No newline at end of file +**(For information about older versions, consult the HISTORY file.)** diff -r ccce01988603 -r 536fccc75f5a Modules/_testcapimodule.c --- a/Modules/_testcapimodule.c Thu Jul 28 09:55:13 2011 -0700 +++ b/Modules/_testcapimodule.c Fri Jul 29 07:05:08 2011 +0300 @@ -1003,6 +1003,15 @@ } static PyObject * +getargs_c(PyObject *self, PyObject *args) +{ + char c; + if (!PyArg_ParseTuple(args, "c", &c)) + return NULL; + return PyBytes_FromStringAndSize(&c, 1); +} + +static PyObject * getargs_s(PyObject *self, PyObject *args) { char *str; @@ -2289,6 +2298,7 @@ (PyCFunction)test_long_long_and_overflow, METH_NOARGS}, {"test_L_code", (PyCFunction)test_L_code, METH_NOARGS}, #endif + {"getargs_c", getargs_c, METH_VARARGS}, {"getargs_s", getargs_s, METH_VARARGS}, {"getargs_s_star", getargs_s_star, METH_VARARGS}, {"getargs_s_hash", getargs_s_hash, METH_VARARGS}, diff -r ccce01988603 -r 536fccc75f5a Python/getargs.c --- a/Python/getargs.c Thu Jul 28 09:55:13 2011 -0700 +++ b/Python/getargs.c Fri Jul 29 07:05:08 2011 +0300 @@ -828,6 +828,8 @@ 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; /eliben@gmail.com