Fix error when use unicode_literal in Python 2

Author: methane

.travis.yml

@@ -14,4 +14,4 @@ install:
     - pip install wheelhouse/Cython-0.21.2-cp27-none-linux_x86_64.whl
     - cython --cplus msgpack/_packer.pyx msgpack/_unpacker.pyx
 
-script: tox
+script: tox -e py26-c,py26-pure,py27-c,py27-pure,py32-c,py32-pure,py33-c,py33-pure,py34-c,py34-pure,pypy-pure,pypy3-pure

msgpack/_unpacker.pyx

@@ -251,7 +251,7 @@ cdef class Unpacker(object):
 
     def __init__(self, file_like=None, Py_ssize_t read_size=0, bint use_list=1,
                  object object_hook=None, object object_pairs_hook=None, object list_hook=None,
-                 str encoding=None, str unicode_errors='strict', int max_buffer_size=0,
+                 encoding=None, unicode_errors='strict', int max_buffer_size=0,
                  object ext_hook=ExtType,
                  Py_ssize_t max_str_len=2147483647, # 2**32-1
                  Py_ssize_t max_bin_len=2147483647,
@@ -289,15 +289,19 @@ cdef class Unpacker(object):
         if encoding is not None:
             if isinstance(encoding, unicode):
                 self.encoding = encoding.encode('ascii')
-            else:
+            elif isinstance(encoding, bytes):
                 self.encoding = encoding
+            else:
+                raise TypeError("encoding should be bytes or unicode")
             cenc = PyBytes_AsString(self.encoding)
 
         if unicode_errors is not None:
             if isinstance(unicode_errors, unicode):
                 self.unicode_errors = unicode_errors.encode('ascii')
-            else:
+            elif isinstance(encoding, bytes)
                 self.unicode_errors = unicode_errors
+            else:
+                raise TypeError("unicode_errors should be bytes or unicode")
             cerr = PyBytes_AsString(self.unicode_errors)
 
         init_ctx(&self.ctx, object_hook, object_pairs_hook, list_hook,

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = {py26,py27,py32,py33,py34}-{c,pure},{pypy,pypy3}-pure
+envlist = {py26,py27,py32,py33,py34}-{c,pure},{pypy,pypy3}-pure,py27-x86,py34-x86
 
 [variants:pure]
 setenv=
@@ -11,6 +11,29 @@ deps=
 
 changedir=test
 commands=
-    c: python -c 'from msgpack import _packer, _unpacker'
-    c: py.test
+    c,x86: python -c 'from msgpack import _packer, _unpacker'
+    c,x86: py.test
     pure: py.test
+
+[testenv:py27-x86]
+basepython=python2.7-x86
+deps=
+    pytest
+
+changedir=test
+commands=
+    python -c 'import sys; print(hex(sys.maxsize))'
+    python -c 'from msgpack import _packer, _unpacker'
+    py.test
+
+[testenv:py34-x86]
+basepython=python3.4-x86
+deps=
+    pytest
+
+changedir=test
+commands=
+    python -c 'import sys; print(hex(sys.maxsize))'
+    python -c 'from msgpack import _packer, _unpacker'
+    py.test
+