diff options
| author | Bob Ippolito <bob@redivi.com> | 2015-07-18 14:46:24 -0700 |
|---|---|---|
| committer | Bob Ippolito <bob@redivi.com> | 2015-07-18 14:46:24 -0700 |
| commit | a37a9bdb821ea94bc5e566fe9f6db2029df39447 (patch) | |
| tree | 3d10596e567f9e3a0eb9d2c10ada173d70239eca /simplejson | |
| parent | a9e5e7256c9fb27126813c9430be1dab5f27f7ba (diff) | |
| download | simplejson-a37a9bdb821ea94bc5e566fe9f6db2029df39447.tar.gz | |
clean up iterable_as_array for 3.8.0v3.8.0
Diffstat (limited to 'simplejson')
| -rw-r--r-- | simplejson/__init__.py | 2 | ||||
| -rw-r--r-- | simplejson/_speedups.c | 3 |
2 files changed, 3 insertions, 2 deletions
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, |