diff options
-rw-r--r-- | CHANGES.txt | 5 | ||||
-rw-r--r-- | conf.py | 2 | ||||
-rw-r--r-- | setup.py | 2 | ||||
-rw-r--r-- | simplejson/__init__.py | 2 | ||||
-rw-r--r-- | simplejson/encoder.py | 2 |
5 files changed, 9 insertions, 4 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index 415ec20..503c8a6 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,3 +1,8 @@ +Version 3.7.3 released 2015-05-31 + +* Fix typo introduced in 3.7.0 (behavior should be indistinguishable) + https://github.com/simplejson/simplejson/commit/e18cc09b688ea1f3305c27616fd3cadd2adc6d31#commitcomment-11443842 + Version 3.7.2 released 2015-05-22 * Do not cache Decimal class in encoder, only reference the decimal module. @@ -44,7 +44,7 @@ copyright = '2015, Bob Ippolito' # The short X.Y version. version = '3.7' # The full version, including alpha/beta/rc tags. -release = '3.7.2' +release = '3.7.3' # There are two options for replacing |today|: either, you set today to some # non-false value, then it is used: @@ -11,7 +11,7 @@ from distutils.errors import CCompilerError, DistutilsExecError, \ DistutilsPlatformError IS_PYPY = hasattr(sys, 'pypy_translation_info') -VERSION = '3.7.2' +VERSION = '3.7.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 5be65e7..b8d5097 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.7.2' +__version__ = '3.7.3' __all__ = [ 'dump', 'dumps', 'load', 'loads', 'JSONDecoder', 'JSONDecodeError', 'JSONEncoder', diff --git a/simplejson/encoder.py b/simplejson/encoder.py index a266333..d240438 100644 --- a/simplejson/encoder.py +++ b/simplejson/encoder.py @@ -510,7 +510,7 @@ def _make_iterencode(markers, _default, _encoder, _indent, _floatstr, elif key is None: key = 'null' elif isinstance(key, integer_types): - if key not in integer_types: + if type(key) not in integer_types: # See #118, do not trust custom str/repr key = int(key) key = str(key) |