Merge branch 'release/0.9.5'

1 files changed, 5 insertions, 5 deletions

diff --git a/tablib/packages/anyjson.py b/tablib/packages/anyjson.py
index 6603751..a7d1a5f 100644
--- a/tablib/packages/anyjson.py
+++ b/tablib/packages/anyjson.py
@@ -53,7 +53,7 @@ class _JsonImplementation(object):
     """Incapsulates a JSON implementation"""
 
     def __init__(self, modspec):
-        modinfo = dict(zip(_fields, modspec))
+        modinfo = dict(list(zip(_fields, modspec)))
 
         # No try block. We want importerror to end up at caller
         module = self._attempt_load(modinfo["modname"])
@@ -64,9 +64,9 @@ class _JsonImplementation(object):
         self._encode_error = modinfo["encerror"]
         self._decode_error = modinfo["decerror"]
 
-        if isinstance(modinfo["encerror"], basestring):
+        if isinstance(modinfo["encerror"], str):
             self._encode_error = getattr(module, modinfo["encerror"])
-        if isinstance(modinfo["decerror"], basestring):
+        if isinstance(modinfo["decerror"], str):
             self._decode_error = getattr(module, modinfo["decerror"])
 
         self.name = modinfo["modname"]
@@ -82,7 +82,7 @@ class _JsonImplementation(object):
         TypeError if the object could not be serialized."""
         try:
             return self._encode(data)
-        except self._encode_error, exc:
+        except self._encode_error as exc:
             raise TypeError(*exc.args)
 
     def deserialize(self, s):
@@ -90,7 +90,7 @@ class _JsonImplementation(object):
         ValueError if the string vould not be parsed."""
         try:
             return self._decode(s)
-        except self._decode_error, exc:
+        except self._decode_error as exc:
             raise ValueError(*exc.args)