diff options
author | Bob Ippolito <bob@redivi.com> | 2012-05-10 15:12:21 -0700 |
---|---|---|
committer | Bob Ippolito <bob@redivi.com> | 2012-05-10 15:12:21 -0700 |
commit | e1919939c141bb55c18c67cf576bdb3c2fc0ab18 (patch) | |
tree | 720e691e4f5428b7d0932a50f2ad4060bcf97dad | |
parent | 607a4898322da4ff51f992690118ee6e5fa1be1d (diff) | |
download | simplejson-e1919939c141bb55c18c67cf576bdb3c2fc0ab18.tar.gz |
Fix for regression introduced in 2.5.1v2.5.2
-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/_speedups.c | 2 |
5 files changed, 9 insertions, 4 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index 7e5a8bf..f5840cc 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,3 +1,8 @@ +Version 2.5.2 released 2012-05-10 + +* Fix for regression introduced in 2.5.1 + https://github.com/simplejson/simplejson/issues/35 + Version 2.5.1 released 2012-05-10 * Support for use_decimal=True in environments that use Python @@ -44,7 +44,7 @@ copyright = '2011, Bob Ippolito' # The short X.Y version. version = '2.5' # The full version, including alpha/beta/rc tags. -release = '2.5.1' +release = '2.5.2' # There are two options for replacing |today|: either, you set today to some # non-false value, then it is used: @@ -7,7 +7,7 @@ from distutils.errors import CCompilerError, DistutilsExecError, \ DistutilsPlatformError IS_PYPY = hasattr(sys, 'pypy_translation_info') -VERSION = '2.5.1' +VERSION = '2.5.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 2a997f2..187f752 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.5.1' +__version__ = '2.5.2' __all__ = [ 'dump', 'dumps', 'load', 'loads', 'JSONDecoder', 'JSONDecodeError', 'JSONEncoder', diff --git a/simplejson/_speedups.c b/simplejson/_speedups.c index 09d2201..92e527b 100644 --- a/simplejson/_speedups.c +++ b/simplejson/_speedups.c @@ -2061,7 +2061,7 @@ static int encoder_init(PyObject *self, PyObject *args, PyObject *kwds) { /* initialize Encoder object */ - static char *kwlist[] = {"markers", "default", "encoder", "indent", "key_separator", "item_separator", "sort_keys", "skipkeys", "allow_nan", "key_memo", "use_decimal", "namedtuple_as_object", "tuple_as_array", "bigint_as_string", "item_sort_key", NULL}; + static char *kwlist[] = {"markers", "default", "encoder", "indent", "key_separator", "item_separator", "sort_keys", "skipkeys", "allow_nan", "key_memo", "use_decimal", "namedtuple_as_object", "tuple_as_array", "bigint_as_string", "item_sort_key", "Decimal", NULL}; PyEncoderObject *s; PyObject *markers, *defaultfn, *encoder, *indent, *key_separator; |