summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorINADA Naoki <inada-n@klab.com>2013-02-26 09:55:13 +0900
committerINADA Naoki <inada-n@klab.com>2013-02-26 09:55:13 +0900
commit5176e92d995f95b1b7db2554f6d44112ed04e8f8 (patch)
treed7b01827c4581981790592100cf868a80ba3eac9
parent8e13598a36cbf56992454a04e1c4e92e4cfb15b8 (diff)
downloadmsgpack-python-5176e92d995f95b1b7db2554f6d44112ed04e8f8.tar.gz
Fix typeerror.
-rw-r--r--msgpack/_unpacker.pyx14
1 files changed, 8 insertions, 6 deletions
diff --git a/msgpack/_unpacker.pyx b/msgpack/_unpacker.pyx
index bd838f2..daeb6d7 100644
--- a/msgpack/_unpacker.pyx
+++ b/msgpack/_unpacker.pyx
@@ -239,15 +239,17 @@ cdef class Unpacker(object):
if encoding is not None:
if isinstance(encoding, unicode):
- encoding = encoding.encode('ascii')
- self.encoding = encoding
- cenc = PyBytes_AsString(encoding)
+ self.encoding = encoding.encode('ascii')
+ else:
+ self.encoding = encoding
+ cenc = PyBytes_AsString(self.encoding)
if unicode_errors is not None:
if isinstance(unicode_errors, unicode):
- unicode_errors = unicode_errors.encode('ascii')
- self.unicode_errors = unicode_errors
- cerr = PyBytes_AsString(unicode_errors)
+ self.unicode_errors = unicode_errors.encode('ascii')
+ else:
+ self.unicode_errors = unicode_errors
+ cerr = PyBytes_AsString(self.unicode_errors)
init_ctx(&self.ctx, object_hook, object_pairs_hook, list_hook, use_list, cenc, cerr)