mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-09 16:34:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 17

Issue #5640: Fix _multibytecodec so that CJK codecs don't repeat

Browse source 
error replacement returned by codec error callbacks twice in
IncrementalEncoder and StreamWriter.
This commit is contained in:
Hye-Shik Chang 2009-04-02 10:33:16 +00:00
parent a3d056ed95
commit 944820b044
3 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Lib/test/test_multibytecodec.py
View file

@ -112,6 +112,10 @@ class Test_IncrementalEncoder(unittest.TestCase):
self.assertRaises(UnicodeEncodeError, encoder.encode, '\u0123') self.assertRaises(UnicodeEncodeError, encoder.encode, '\u0123')
self.assertEqual(encoder.encode('', True), b'\xa9\xdc') self.assertEqual(encoder.encode('', True), b'\xa9\xdc')
def test_issue5640(self):
encoder = codecs.getincrementalencoder('shift-jis')('backslashreplace')
self.assertEqual(encoder.encode('\xff'), b'\\xff')
self.assertEqual(encoder.encode('\n'), b'\n')
class Test_IncrementalDecoder(unittest.TestCase): class Test_IncrementalDecoder(unittest.TestCase):

4
Misc/NEWS
View file

@ -58,6 +58,10 @@ Core and Builtins
Library Library
------- -------
- Issue #5640: Fix _multibytecodec so that CJK codecs don't repeat
error substitutions from non-strict codec error callbacks in
incrementalencoder and StreamWriter.
- Issue #5656: Fix the coverage reporting when running the test suite with - Issue #5656: Fix the coverage reporting when running the test suite with
the -T argument. the -T argument.

2
Modules/cjkcodecs/multibytecodec.c
View file

@ -506,7 +506,6 @@ multibytecodec_encode(MultibyteCodec *codec,
outleft = (Py_ssize_t)(buf.outbuf_end - buf.outbuf); outleft = (Py_ssize_t)(buf.outbuf_end - buf.outbuf);
r = codec->encode(state, codec->config, &buf.inbuf, inleft, r = codec->encode(state, codec->config, &buf.inbuf, inleft,
&buf.outbuf, outleft, flags); &buf.outbuf, outleft, flags);
*data = buf.inbuf;
if ((r == 0) || (r == MBERR_TOOFEW && !(flags & MBENC_FLUSH))) if ((r == 0) || (r == MBERR_TOOFEW && !(flags & MBENC_FLUSH)))
break; break;
else if (multibytecodec_encerror(codec, state, &buf, errors,r)) else if (multibytecodec_encerror(codec, state, &buf, errors,r))
@ -536,6 +535,7 @@ multibytecodec_encode(MultibyteCodec *codec,
if (_PyBytes_Resize(&buf.outobj, finalsize) == -1) if (_PyBytes_Resize(&buf.outobj, finalsize) == -1)
goto errorexit; goto errorexit;
*data = buf.inbuf;
Py_XDECREF(buf.excobj); Py_XDECREF(buf.excobj);
return buf.outobj; return buf.outobj;