Fix encoding and unicode_errors (msgpack#277)

andrewrabert · methane · commit a0ba076c3527 · 2018-02-03T10:34:42.000+09:00
Previously, unicode_errors was either set to NULL or to
the result of PyBytes_AsString. This restores that behavior while also
keeping the existing NULL default behavior.
Original defaults were restored to keep API compatibility until these
deprecated options are finally removed.
diff --git a/msgpack/_packer.pyx b/msgpack/_packer.pyx
@@ -127,27 +127,26 @@ cdef class Packer(object):
             if not PyCallable_Check(default):
                 raise TypeError("default must be a callable.")
         self._default = default
-        if encoding is None:
-            if unicode_errors is None:
-                self.encoding = NULL
-                self.unicode_errors = NULL
-            else:
-                self.encoding = "utf_8"
-                self.unicode_errors = unicode_errors
+        if encoding is None and unicode_errors is None:
+            self.encoding = NULL
+            self.unicode_errors = NULL
         else:
-            if isinstance(encoding, unicode):
-                self._bencoding = encoding.encode('ascii')
+            if encoding is None:
+                self.encoding = 'utf-8'
             else:
-                self._bencoding = encoding
-            self.encoding = PyBytes_AsString(self._bencoding)
-            if isinstance(unicode_errors, unicode):
-                self._berrors = unicode_errors.encode('ascii')
+                if isinstance(encoding, unicode):
+                    self._bencoding = encoding.encode('ascii')
+                else:
+                    self._bencoding = encoding
+                self.encoding = PyBytes_AsString(self._bencoding)
+            if unicode_errors is None:
+                self.unicode_errors = 'strict'
             else:
-                self._berrors = unicode_errors
-            if self._berrors is not None:
+                if isinstance(unicode_errors, unicode):
+                    self._berrors = unicode_errors.encode('ascii')
+                else:
+                    self._berrors = unicode_errors
                 self.unicode_errors = PyBytes_AsString(self._berrors)
-            else:
-                self.unicode_errors = NULL
 
     def __dealloc__(self):
         PyMem_Free(self.pk.buf)
