summaryrefslogtreecommitdiff
path: root/simplejson
diff options
context:
space:
mode:
authorBob Ippolito <bob@redivi.com>2014-02-14 16:16:12 -0800
committerBob Ippolito <bob@redivi.com>2014-02-14 16:16:12 -0800
commit59dc5296f731f868678cbdcba199a77a0513e5c1 (patch)
tree91f7763da65666f05b7c9f5282ecf32fb1607d64 /simplejson
parenta03499478fa57299798c68bbab1c5285a26a4a73 (diff)
downloadsimplejson-59dc5296f731f868678cbdcba199a77a0513e5c1.tar.gz
improve Python 3.3 compat #87, bump to 3.3.3v3.3.3
Diffstat (limited to 'simplejson')
-rw-r--r--simplejson/__init__.py2
-rw-r--r--simplejson/compat.py5
-rw-r--r--simplejson/tests/test_errors.py8
3 files changed, 9 insertions, 6 deletions
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)