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
........

diff --git a/Lib/test/test_multibytecodec.py b/Lib/test/test_multibytecodec.py
index 090374cdafb0d752fb756b3b0f6cdd7dbe74e8cf..8536f0a9f488590bbc1cd885f871401d09e1e853 100644 (file)
--- 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):
 

diff --git a/Misc/NEWS b/Misc/NEWS
index 6b97a3dec33e741e426161d30812da344c812b08..a4279941242d634909e7e28e7b9780b98cfb4a49 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -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 9856f0421a14f7bd91749ede236692163b6cc68a..a83f73bf36ebf8399f8fe608ec8da29492f59c54 100644 (file)
--- 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;