Skip to content
Snippets Groups Projects
Commit f15d6b193de3 authored by Bob Ippolito's avatar Bob Ippolito
Browse files

Fix for regression introduced in 2.5.1

parent 42e60cf4e8ce
Branches
No related tags found
No related merge requests found
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 Version 2.5.1 released 2012-05-10
* Support for use_decimal=True in environments that use Python * Support for use_decimal=True in environments that use Python
......
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
# The short X.Y version. # The short X.Y version.
version = '2.5' version = '2.5'
# The full version, including alpha/beta/rc tags. # 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 # There are two options for replacing |today|: either, you set today to some
# non-false value, then it is used: # non-false value, then it is used:
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
DistutilsPlatformError DistutilsPlatformError
IS_PYPY = hasattr(sys, 'pypy_translation_info') IS_PYPY = hasattr(sys, 'pypy_translation_info')
VERSION = '2.5.1' VERSION = '2.5.2'
DESCRIPTION = "Simple, fast, extensible JSON encoder/decoder for Python" DESCRIPTION = "Simple, fast, extensible JSON encoder/decoder for Python"
LONG_DESCRIPTION = open('README.rst', 'r').read() LONG_DESCRIPTION = open('README.rst', 'r').read()
......
...@@ -97,7 +97,7 @@ ...@@ -97,7 +97,7 @@
$ echo '{ 1.2:3.4}' | python -m simplejson.tool $ echo '{ 1.2:3.4}' | python -m simplejson.tool
Expecting property name: line 1 column 2 (char 2) Expecting property name: line 1 column 2 (char 2)
""" """
__version__ = '2.5.1' __version__ = '2.5.2'
__all__ = [ __all__ = [
'dump', 'dumps', 'load', 'loads', 'dump', 'dumps', 'load', 'loads',
'JSONDecoder', 'JSONDecodeError', 'JSONEncoder', 'JSONDecoder', 'JSONDecodeError', 'JSONEncoder',
......
...@@ -2061,7 +2061,7 @@ ...@@ -2061,7 +2061,7 @@
encoder_init(PyObject *self, PyObject *args, PyObject *kwds) encoder_init(PyObject *self, PyObject *args, PyObject *kwds)
{ {
/* initialize Encoder object */ /* 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; PyEncoderObject *s;
PyObject *markers, *defaultfn, *encoder, *indent, *key_separator; PyObject *markers, *defaultfn, *encoder, *indent, *key_separator;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment