diff options
| author | Victor Stinner <victor.stinner@haypocalc.com> | 2010-05-21 22:55:31 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@haypocalc.com> | 2010-05-21 22:55:31 (GMT) |
| commit | 9a4a01df756b7cde999214401e146600570b5cad (patch) | |
| tree | d03505f997212236b3c6421cda705259708bf426 | |
| parent | 86a33341c0cf2cf1660f10dcfd5adf428e9213aa (diff) | |
| download | cpython-9a4a01df756b7cde999214401e146600570b5cad.zip cpython-9a4a01df756b7cde999214401e146600570b5cad.tar.gz cpython-9a4a01df756b7cde999214401e146600570b5cad.tar.bz2 | |
Merged revisions 81454 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r81454 | victor.stinner | 2010-05-22 00:50:28 +0200 (sam., 22 mai 2010) | 3 lines
Issue #5640: Fix Shift-JIS incremental encoder for error handlers different
than strict
........
| -rw-r--r-- | Lib/test/test_multibytecodec.py | 4 | ||||
| -rw-r--r-- | Misc/NEWS | 3 | ||||
| -rw-r--r-- | Modules/cjkcodecs/multibytecodec.c | 2 |
3 files changed, 8 insertions, 1 deletions
diff --git a/Lib/test/test_multibytecodec.py b/Lib/test/test_multibytecodec.py index 090374c..8536f0a 100644 --- a/Lib/test/test_multibytecodec.py +++ b/Lib/test/test_multibytecodec.py @@ -108,6 +108,10 @@ class Test_IncrementalEncoder(unittest.TestCase): self.assertRaises(UnicodeEncodeError, encoder.encode, u'\u0123') self.assertEqual(encoder.encode(u'', True), '\xa9\xdc') + def test_issue5640(self): + encoder = codecs.getincrementalencoder('shift-jis')('backslashreplace') + self.assertEqual(encoder.encode(u'\xff'), b'\\xff') + self.assertEqual(encoder.encode(u'\n'), b'\n') class Test_IncrementalDecoder(unittest.TestCase): @@ -55,6 +55,9 @@ C-API Library ------- +- Issue #5640: Fix Shift-JIS incremental encoder for error handlers different + than strict + - Issue #8782: Add a trailing newline in linecache.updatecache to the last line of files without one. diff --git a/Modules/cjkcodecs/multibytecodec.c b/Modules/cjkcodecs/multibytecodec.c index 9856f04..a83f73b 100644 --- a/Modules/cjkcodecs/multibytecodec.c +++ b/Modules/cjkcodecs/multibytecodec.c @@ -498,7 +498,6 @@ multibytecodec_encode(MultibyteCodec *codec, outleft = (Py_ssize_t)(buf.outbuf_end - buf.outbuf); r = codec->encode(state, codec->config, &buf.inbuf, inleft, &buf.outbuf, outleft, flags); - *data = buf.inbuf; if ((r == 0) || (r == MBERR_TOOFEW && !(flags & MBENC_FLUSH))) break; else if (multibytecodec_encerror(codec, state, &buf, errors,r)) @@ -528,6 +527,7 @@ multibytecodec_encode(MultibyteCodec *codec, if (_PyString_Resize(&buf.outobj, finalsize) == -1) goto errorexit; + *data = buf.inbuf; Py_XDECREF(buf.excobj); return buf.outobj; |