diff options
| author |  RaNaN <Mast3rRaNaN@hotmail.de>
| 2011-06-05 00:06:35 +0200 |
|---|---|---|
| committer | RaNaN <Mast3rRaNaN@hotmail.de>
| 2011-06-05 00:06:35 +0200 |
| commit | 9bde87941885969d46281cf03826c4bcc71b4baf (patch) | |
| tree | 785f5bc132489561cb29e15a2a01caca8fd67cbf /module | |
| parent | tidy, fix getInfo (diff) | |
| download | pyload-9bde87941885969d46281cf03826c4bcc71b4baf.tar.xz | |
new simplejson version
Diffstat (limited to 'module')
| -rw-r--r-- | module/lib/simplejson/__init__.py | 2 | ||||
| -rw-r--r-- | module/lib/simplejson/encoder.py | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/module/lib/simplejson/__init__.py b/module/lib/simplejson/__init__.py index c36be23c0..210b957a9 100644 --- a/module/lib/simplejson/__init__.py +++ b/module/lib/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.1.3' +__version__ = '2.1.6' __all__ = [ 'dump', 'dumps', 'load', 'loads', 'JSONDecoder', 'JSONDecodeError', 'JSONEncoder', diff --git a/module/lib/simplejson/encoder.py b/module/lib/simplejson/encoder.py index 468d1bd82..f43f6f430 100644 --- a/module/lib/simplejson/encoder.py +++ b/module/lib/simplejson/encoder.py @@ -165,6 +165,8 @@ class JSONEncoder(object): self.indent = indent if separators is not None: self.item_separator, self.key_separator = separators + elif indent is not None: + self.item_separator = ',' if default is not None: self.default = default self.encoding = encoding |