improve Python 3.3 compat #87, bump to 3.3.3v3.3.3

6 files changed, 16 insertions, 8 deletions

diff --git a/CHANGES.txt b/CHANGES.txt
index 5f92ccc..ee64c8a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,8 @@
+Version 3.3.3 released 2014-02-14
+
+* Improve test suite's Python 3.4 compatibility
+  https://github.com/simplejson/simplejson/issues/87
+
 Version 3.3.2 released 2014-01-06
 
 * Docstring fix for decoded string types
diff --git a/conf.py b/conf.py
index 56dfa7b..58038a8 100644
--- a/conf.py
+++ b/conf.py
@@ -44,7 +44,7 @@ copyright = '2014, Bob Ippolito'
 # The short X.Y version.
 version = '3.3'
 # The full version, including alpha/beta/rc tags.
-release = '3.3.2'
+release = '3.3.3'
 
 # There are two options for replacing |today|: either, you set today to some
 # non-false value, then it is used:
diff --git a/setup.py b/setup.py
index 8625290..f0d0a27 100644
--- a/setup.py
+++ b/setup.py
@@ -13,7 +13,7 @@ from distutils.errors import CCompilerError, DistutilsExecError, \
     DistutilsPlatformError
 
 IS_PYPY = hasattr(sys, 'pypy_translation_info')
-VERSION = '3.3.2'
+VERSION = '3.3.3'
 DESCRIPTION = "Simple, fast, extensible JSON encoder/decoder for Python"
 
 with open('README.rst', 'r') as f:
diff --git a/simplejson/__init__.py b/simplejson/__init__.py
index 4426a55..f76ce22 100644
--- a/simplejson/__init__.py
+++ b/simplejson/__init__.py
@@ -98,7 +98,7 @@ Using simplejson.tool from the shell to validate and pretty-print::
     Expecting property name: line 1 column 3 (char 2)
 """
 from __future__ import absolute_import
-__version__ = '3.3.2'
+__version__ = '3.3.3'
 __all__ = [
     'dump', 'dumps', 'load', 'loads',
     'JSONDecoder', 'JSONDecodeError', 'JSONEncoder',
diff --git a/simplejson/compat.py b/simplejson/compat.py
index 449e48a..a0af4a1 100644
--- a/simplejson/compat.py
+++ b/simplejson/compat.py
@@ -20,7 +20,10 @@ if sys.version_info[0] < 3:
 
 else:
     PY3 = True
-    from imp import reload as reload_module
+    if sys.version_info[:2] >= (3, 4):
+        from importlib import reload as reload_module
+    else:
+        from imp import reload as reload_module
     import codecs
     def b(s):
         return codecs.latin_1_encode(s)[0]
diff --git a/simplejson/tests/test_errors.py b/simplejson/tests/test_errors.py
index e86121d..8dede38 100644
--- a/simplejson/tests/test_errors.py
+++ b/simplejson/tests/test_errors.py
@@ -45,7 +45,7 @@ class TestErrors(TestCase):
         s = pickle.dumps(err)
         e = pickle.loads(s)
 
-        self.assertEquals(err.msg, e.msg)
-        self.assertEquals(err.doc, e.doc)
-        self.assertEquals(err.pos, e.pos)
-        self.assertEquals(err.end, e.end)
+        self.assertEqual(err.msg, e.msg)
+        self.assertEqual(err.doc, e.doc)
+        self.assertEqual(err.pos, e.pos)
+        self.assertEqual(err.end, e.end)