diff --git a/CHANGES.txt b/CHANGES.txt index 247addce63d94ac1cd419d35ea2cd35232dc10bc_Q0hBTkdFUy50eHQ=..fc6a3cebb4ba8d50fd778fb154721807e5467e86_Q0hBTkdFUy50eHQ= 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,3 +1,7 @@ +Version 2.3.2 released 2011-12-30 + +* Fix crashing regression in speedups introduced in 2.3.1 + Version 2.3.1 released 2011-12-29 * namedtuple_as_object now checks _asdict to ensure that it diff --git a/conf.py b/conf.py index 247addce63d94ac1cd419d35ea2cd35232dc10bc_Y29uZi5weQ==..fc6a3cebb4ba8d50fd778fb154721807e5467e86_Y29uZi5weQ== 100644 --- a/conf.py +++ b/conf.py @@ -44,7 +44,7 @@ # The short X.Y version. version = '2.3' # The full version, including alpha/beta/rc tags. -release = '2.3.1' +release = '2.3.2' # 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 247addce63d94ac1cd419d35ea2cd35232dc10bc_c2V0dXAucHk=..fc6a3cebb4ba8d50fd778fb154721807e5467e86_c2V0dXAucHk= 100644 --- a/setup.py +++ b/setup.py @@ -7,7 +7,7 @@ DistutilsPlatformError IS_PYPY = hasattr(sys, 'pypy_translation_info') -VERSION = '2.3.1' +VERSION = '2.3.2' DESCRIPTION = "Simple, fast, extensible JSON encoder/decoder for Python" LONG_DESCRIPTION = open('README.rst', 'r').read() diff --git a/simplejson/__init__.py b/simplejson/__init__.py index 247addce63d94ac1cd419d35ea2cd35232dc10bc_c2ltcGxlanNvbi9fX2luaXRfXy5weQ==..fc6a3cebb4ba8d50fd778fb154721807e5467e86_c2ltcGxlanNvbi9fX2luaXRfXy5weQ== 100644 --- a/simplejson/__init__.py +++ b/simplejson/__init__.py @@ -97,7 +97,7 @@ $ echo '{ 1.2:3.4}' | python -m simplejson.tool Expecting property name: line 1 column 2 (char 2) """ -__version__ = '2.3.1' +__version__ = '2.3.2' __all__ = [ 'dump', 'dumps', 'load', 'loads', 'JSONDecoder', 'JSONDecodeError', 'JSONEncoder', diff --git a/simplejson/_speedups.c b/simplejson/_speedups.c index 247addce63d94ac1cd419d35ea2cd35232dc10bc_c2ltcGxlanNvbi9fc3BlZWR1cHMuYw==..fc6a3cebb4ba8d50fd778fb154721807e5467e86_c2ltcGxlanNvbi9fc3BlZWR1cHMuYw== 100644 --- a/simplejson/_speedups.c +++ b/simplejson/_speedups.c @@ -175,8 +175,8 @@ PyErr_Clear(); return 0; } - rval = PyCallable_Check(obj); - Py_DECREF(obj); + rval = PyCallable_Check(_asdict); + Py_DECREF(_asdict); return rval; }