mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-11 19:27:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

merge 3.3 (#16585)

Browse source
This commit is contained in:
Benjamin Peterson 2012-12-02 11:21:02 -05:00
commit 26e5335a46
3 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Lib/test/test_multibytecodec.py
View file

@ -45,6 +45,10 @@ class Test_MultibyteCodec(unittest.TestCase):
self.assertRaises(IndexError, dec, self.assertRaises(IndexError, dec,
b'apple\x92ham\x93spam', 'test.cjktest') b'apple\x92ham\x93spam', 'test.cjktest')
def test_errorhandler_returns_bytes(self):
enc = "\u30fb\udc80".encode('gb18030', 'surrogateescape')
self.assertEqual(enc, b'\x819\xa79\x80')
def test_codingspec(self): def test_codingspec(self):
try: try:
for enc in ALL_CJKENCODINGS: for enc in ALL_CJKENCODINGS:

3
Misc/NEWS
View file

@ -145,6 +145,9 @@ Core and Builtins
Library Library
------- -------
- Issue #16585: Make CJK encoders support error handlers that return bytes per
PEP 383.
- Issue #10182: The re module doesn't truncate indices to 32 bits anymore. - Issue #10182: The re module doesn't truncate indices to 32 bits anymore.
Patch by Serhiy Storchaka. Patch by Serhiy Storchaka.

8
Modules/cjkcodecs/multibytecodec.c
View file

@ -316,7 +316,7 @@ multibytecodec_encerror(MultibyteCodec *codec,
goto errorexit; goto errorexit;
if (!PyTuple_Check(retobj) || PyTuple_GET_SIZE(retobj) != 2 || if (!PyTuple_Check(retobj) || PyTuple_GET_SIZE(retobj) != 2 ||
!PyUnicode_Check((tobj = PyTuple_GET_ITEM(retobj, 0))) || (!PyUnicode_Check((tobj = PyTuple_GET_ITEM(retobj, 0))) && !PyBytes_Check(tobj)) ||
!PyLong_Check(PyTuple_GET_ITEM(retobj, 1))) { !PyLong_Check(PyTuple_GET_ITEM(retobj, 1))) {
PyErr_SetString(PyExc_TypeError, PyErr_SetString(PyExc_TypeError,
"encoding error handler must return " "encoding error handler must return "
@ -324,7 +324,7 @@ multibytecodec_encerror(MultibyteCodec *codec,
goto errorexit; goto errorexit;
} }
{ if (PyUnicode_Check(tobj)) {
const Py_UNICODE *uraw = PyUnicode_AS_UNICODE(tobj); const Py_UNICODE *uraw = PyUnicode_AS_UNICODE(tobj);
retstr = multibytecodec_encode(codec, state, &uraw, retstr = multibytecodec_encode(codec, state, &uraw,
@ -333,6 +333,10 @@ multibytecodec_encerror(MultibyteCodec *codec,
if (retstr == NULL) if (retstr == NULL)
goto errorexit; goto errorexit;
} }
else {
Py_INCREF(tobj);
retstr = tobj;
}
assert(PyBytes_Check(retstr)); assert(PyBytes_Check(retstr));
retstrsize = PyBytes_GET_SIZE(retstr); retstrsize = PyBytes_GET_SIZE(retstr);