Correction of patch #1455898: In the mbcs decoder, set final=False

for stream decoder, but final=True for the decode function.

diff --git a/Lib/encodings/mbcs.py b/Lib/encodings/mbcs.py
index ccf08e37176f7bc5dd96d561e507fe36434b5ff0..baf46cbd4836bda6bb8ddccff7c282048383e0a2 100644 (file)
--- a/Lib/encodings/mbcs.py
+++ b/Lib/encodings/mbcs.py
@@ -15,39 +15,31 @@ import codecs
 
 ### Codec APIs
 
-class Codec(codecs.Codec):
+encode = mbcs_encode
 
-    # Note: Binding these as C functions will result in the class not
-    # converting them to methods. This is intended.
-    encode = mbcs_encode
-    decode = mbcs_decode
+def decode(input, errors='strict'):
+    return mbcs_decode(input, errors, True)
 
 class IncrementalEncoder(codecs.IncrementalEncoder):
     def encode(self, input, final=False):
-        return mbcs_encode(input,self.errors)[0]
+        return mbcs_encode(input, self.errors)[0]
 
 class IncrementalDecoder(codecs.BufferedIncrementalDecoder):
-    def _buffer_decode(self, input, errors, final):
-        return mbcs_decode(input,self.errors,final)
-
-class StreamWriter(Codec,codecs.StreamWriter):
-    pass
+    _buffer_decode = mbcs_decode
 
-class StreamReader(Codec,codecs.StreamReader):
-    pass
-
-class StreamConverter(StreamWriter,StreamReader):
+class StreamWriter(codecs.StreamWriter):
+    encode = mbcs_encode
 
-    encode = codecs.mbcs_decode
-    decode = codecs.mbcs_encode
+class StreamReader(codecs.StreamReader):
+    decode = mbcs_decode
 
 ### encodings module API
 
 def getregentry():
     return codecs.CodecInfo(
         name='mbcs',
-        encode=Codec.encode,
-        decode=Codec.decode,
+        encode=encode,
+        decode=decode,
         incrementalencoder=IncrementalEncoder,
         incrementaldecoder=IncrementalDecoder,
         streamreader=StreamReader,

diff --git a/Misc/NEWS b/Misc/NEWS
index 13323f5a489a4a3eff0aa60f2542757a0e16690e..1923b4f91574fcd0eae18fb9c26c624990bc9de3 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -64,6 +64,9 @@ Core and builtins
 Library
 -------
 
+- Correction of patch #1455898: In the mbcs decoder, set final=False
+  for stream decoder, but final=True for the decode function.
+
 - os.urandom no longer masks unrelated exceptions like SystemExit or
   KeyboardInterrupt.
 

diff --git a/Modules/_codecsmodule.c b/Modules/_codecsmodule.c
index 6d384b7d407ae1b2d9b2a8a031e06bae400cdeb5..405fd7a29aca37e73e493064607406901c0f6d56 100644 (file)
--- a/Modules/_codecsmodule.c
+++ b/Modules/_codecsmodule.c
@@ -481,7 +481,7 @@ mbcs_decode(PyObject *self,
     const char *data;
     Py_ssize_t size, consumed;
     const char *errors = NULL;
-    int final = 1;
+    int final = 0;
     PyObject *decoded;
 
     if (!PyArg_ParseTuple(args, "t#|zi:mbcs_decode",