From f9f73115e42bcda4526cc89f145c873c7be2bef6 Mon Sep 17 00:00:00 2001
From: Bob Ippolito <bob@redivi.com>
Date: Fri, 30 Dec 2011 07:32:35 -0800
Subject: fix 2.3.1 regression and bump version to 2.3.2

---
 CHANGES.txt            | 4 ++++
 conf.py                | 2 +-
 setup.py               | 2 +-
 simplejson/__init__.py | 2 +-
 simplejson/_speedups.c | 4 ++--
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 44d67a3..675bfcf 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 ac0185b..ce2bc20 100644
--- a/conf.py
+++ b/conf.py
@@ -44,7 +44,7 @@ copyright = '2011, Bob Ippolito'
 # 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 fb52014..80692b8 100644
--- a/setup.py
+++ b/setup.py
@@ -7,7 +7,7 @@ from distutils.errors import CCompilerError, DistutilsExecError, \
     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 3f7b5a9..7be8562 100644
--- a/simplejson/__init__.py
+++ b/simplejson/__init__.py
@@ -97,7 +97,7 @@ Using simplejson.tool from the shell to validate and pretty-print::
     $ 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 b6c7b1d..c25909e 100644
--- a/simplejson/_speedups.c
+++ b/simplejson/_speedups.c
@@ -175,8 +175,8 @@ _is_namedtuple(PyObject *obj)
         PyErr_Clear();
         return 0;
     }
-    rval = PyCallable_Check(obj);
-    Py_DECREF(obj);
+    rval = PyCallable_Check(_asdict);
+    Py_DECREF(_asdict);
     return rval;
 }
 
-- 
cgit v1.2.1