diff options
| -rw-r--r-- | CHANGES.txt | 2 | ||||
| -rw-r--r-- | conf.py | 4 | ||||
| -rw-r--r-- | index.rst | 12 | ||||
| -rw-r--r-- | setup.py | 2 | ||||
| -rw-r--r-- | simplejson/__init__.py | 2 | ||||
| -rw-r--r-- | simplejson/_speedups.c | 3 |
6 files changed, 13 insertions, 12 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index bbacbd1..a613af3 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,4 @@ -Version 3.7.4 released 2015-XX-XX +Version 3.8.0 released 2015-XX-XX * New iterable_as_array encoder option to perform lazy serialization of any iterable objects, without having to convert to tuple or list. @@ -42,9 +42,9 @@ copyright = '2015, Bob Ippolito' # other places throughout the built documents. # # The short X.Y version. -version = '3.7' +version = '3.8' # The full version, including alpha/beta/rc tags. -release = '3.7.4' +release = '3.8.0' # There are two options for replacing |today|: either, you set today to some # non-false value, then it is used: @@ -234,8 +234,8 @@ Basic Usage any object not in the above table that implements ``__iter__()`` will be encoded as a JSON array. - .. versionchanged:: 3.7.4 - *iterable_as_array* is new in 3.7.4. + .. versionchanged:: 3.8.0 + *iterable_as_array* is new in 3.8.0. .. versionchanged:: 2.2.0 *tuple_as_array* is new in 2.2.0. @@ -385,8 +385,8 @@ Basic Usage any object not in the above table that implements ``__iter__()`` will be encoded as a JSON array. - .. versionchanged:: 2.3.0 - *iterable_as_array* is new in 2.3.0. + .. versionchanged:: 3.8.0 + *iterable_as_array* is new in 3.8.0. To use a custom :class:`JSONDecoder` subclass, specify it with the ``cls`` @@ -681,8 +681,8 @@ Encoders and decoders any object not in the above table that implements ``__iter__()`` will be encoded as a JSON array. - .. versionchanged:: 3.7.4 - *iterable_as_array* is new in 3.7.4. + .. versionchanged:: 3.8.0 + *iterable_as_array* is new in 3.8.0. If *bigint_as_string* is true (default: ``False``), :class:`int`` ``2**53`` and higher or lower than ``-2**53`` will be encoded as strings. This is to @@ -11,7 +11,7 @@ from distutils.errors import CCompilerError, DistutilsExecError, \ DistutilsPlatformError IS_PYPY = hasattr(sys, 'pypy_translation_info') -VERSION = '3.7.4' +VERSION = '3.8.0' 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 cac96ca..ac1e5cb 100644 --- a/simplejson/__init__.py +++ b/simplejson/__init__.py @@ -97,7 +97,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.4' +__version__ = '3.8.0' __all__ = [ 'dump', 'dumps', 'load', 'loads', 'JSONDecoder', 'JSONDecodeError', 'JSONEncoder', diff --git a/simplejson/_speedups.c b/simplejson/_speedups.c index 691c73c..fb68e35 100644 --- a/simplejson/_speedups.c +++ b/simplejson/_speedups.c @@ -2603,6 +2603,7 @@ encoder_init(PyObject *self, PyObject *args, PyObject *kwds) "for_json", "ignore_nan", "Decimal", + "iterable_as_array", NULL}; PyEncoderObject *s; @@ -2615,7 +2616,7 @@ encoder_init(PyObject *self, PyObject *args, PyObject *kwds) assert(PyEncoder_Check(self)); s = (PyEncoderObject *)self; - if (!PyArg_ParseTupleAndKeywords(args, kwds, "OOOOOOOOOOOOOOOOOOO:make_encoder", kwlist, + if (!PyArg_ParseTupleAndKeywords(args, kwds, "OOOOOOOOOOOOOOOOOOOO:make_encoder", kwlist, &markers, &defaultfn, &encoder, &indent, &key_separator, &item_separator, &sort_keys, &skipkeys, &allow_nan, &key_memo, &use_decimal, &namedtuple_as_object, &tuple_as_array, |