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 090374c..8536f0a 100644
--- a/Lib/test/test_multibytecodec.py
+++ b/Lib/test/test_multibytecodec.py
@@ -108,6 +108,10 @@
         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):