From 59dc5296f731f868678cbdcba199a77a0513e5c1 Mon Sep 17 00:00:00 2001 From: Bob Ippolito Date: Fri, 14 Feb 2014 16:16:12 -0800 Subject: improve Python 3.3 compat #87, bump to 3.3.3 --- simplejson/__init__.py | 2 +- simplejson/compat.py | 5 ++++- simplejson/tests/test_errors.py | 8 ++++---- 3 files changed, 9 insertions(+), 6 deletions(-) (limited to 'simplejson') 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) -- cgit v1.2.1