diff options
| author | Bob Ippolito <bob@redivi.com> | 2013-05-01 11:09:00 -0700 |
|---|---|---|
| committer | Bob Ippolito <bob@redivi.com> | 2013-05-01 11:09:00 -0700 |
| commit | c5512d65c2085f6ed91b5f7e3684dbf557bc29f3 (patch) | |
| tree | 22df024083b6ecac2161c15b59dde6de15cf62a8 | |
| parent | ad58a553fbc921e76700bc9d252b6fddcc70f51a (diff) | |
| download | simplejson-c5512d65c2085f6ed91b5f7e3684dbf557bc29f3.tar.gz | |
make argument order for c_make_encoder match make_iterencode
| -rw-r--r-- | simplejson/_speedups.c | 4 | ||||
| -rw-r--r-- | simplejson/encoder.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/simplejson/_speedups.c b/simplejson/_speedups.c index e08c2fd..c698130 100644 --- a/simplejson/_speedups.c +++ b/simplejson/_speedups.c @@ -2588,7 +2588,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", "encoding", "Decimal", "for_json", 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", "encoding", "for_json", "Decimal", NULL}; PyEncoderObject *s; PyObject *markers, *defaultfn, *encoder, *indent, *key_separator; @@ -2603,7 +2603,7 @@ encoder_init(PyObject *self, PyObject *args, PyObject *kwds) &markers, &defaultfn, &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, &encoding, &Decimal, &for_json)) + &item_sort_key, &encoding, &for_json, &Decimal)) return -1; s->markers = markers; diff --git a/simplejson/encoder.py b/simplejson/encoder.py index 9e95a22..f2acdd3 100644 --- a/simplejson/encoder.py +++ b/simplejson/encoder.py @@ -317,8 +317,8 @@ class JSONEncoder(object): self.skipkeys, self.allow_nan, key_memo, self.use_decimal, self.namedtuple_as_object, self.tuple_as_array, self.bigint_as_string, self.item_sort_key, - self.encoding, - Decimal, self.for_json) + self.encoding, self.for_json, + Decimal) else: _iterencode = _make_iterencode( markers, self.default, _encoder, self.indent, floatstr, |