summaryrefslogtreecommitdiff
path: root/simplejson
Commit message (Collapse)AuthorAgeFilesLines
* Prep for v3.16.1 and add JSON lines examplejson-lines-exampleBob Ippolito2018-09-061-2/+22
|
* Update CHANGES for v3.16.0v3.16.0Bob Ippolito2018-06-281-1/+1
|
* fix indentationBenjamin Peterson2018-06-261-1/+1
|
* add testBenjamin Peterson2018-06-261-0/+2
|
* On Python 2, decode empty strings as str not unicode.Benjamin Peterson2018-06-261-7/+8
| | | | | | | | | | | | | | | | In general on Python 2, simplejson decodes ASCII strings as str, only promoting to unicode when needed: >>> simplejson.loads('["Spaetzle", "Spätzle"]') ['Spaetzle', u'Sp\xe4tzle'] Since 83a493db6a8b859ec7b10fa85365dd3fdf144c68, though, simplejson has always decoded empty JSON strings as unicode: >>> simplejson.loads('""') u'' This PR restores the old behavior of decoding empty strings as str.
* v3.15.0v3.15.0Bob Ippolito2018-05-121-1/+1
|
* Merge branch 'master' into speedups-cleanupspeedups-cleanupBob Ippolito2018-04-254-15/+76
|\
| * Merge branch 'master' into str-decodestr-decodeBob Ippolito2018-04-252-6/+13
| |\
| * | Fix the other comment typosBob Ippolito2018-04-251-3/+3
| | |
| * | fix comment typosBob Ippolito2018-04-251-3/+3
| | |
| * | Bypass the decode() method in bytes subclasses.Serhiy Storchaka2018-04-254-15/+76
| | | | | | | | | | | | | | | The Python and the C implementations produce different results due to using the decode() method.
* | | Merge branch 'master' into speedups-cleanupBob Ippolito2018-04-252-6/+13
|\ \ \ | | |/ | |/|
| * | Support builds without cStringIO.cStringIOSerhiy Storchaka2018-04-252-6/+13
| |/ | | | | | | | | The cStringIO module is optional. Fall back to StringIO if it is not available.
* | Clean up the C code.Serhiy Storchaka2018-04-251-141/+105
|/ | | | | | | | | * Define less version-specific macros. * Remove redundant version checks and code inside version-specific code. * Always check `PyUnicode_READY()` for external unicode objects. * Use `PyUnicode_Join()`. * Use `PyUnicode_FromOrdinal()`. * All Python string constants are now allocated only once.
* Allow to disable serializing bytes by default in Python 3.bytes-encodingSerhiy Storchaka2018-04-253-17/+107
| | | | | If encoding is None, then bytes objects will be passed to the default() method instead of transforming into unicode.
* Merge pull request #215 from simplejson/compatBob Ippolito2018-04-247-36/+29
|\ | | | | Simplify the compatibility code.
| * Simplify compatibility code.compatSerhiy Storchaka2018-04-247-36/+29
| | | | | | | | | | Since minimal supported Python 3 version is 3.3, the u() helper no longer needed.
* | Fix tests in Python 2.5.tempfile-py25Serhiy Storchaka2018-04-241-9/+18
|/ | | | NamedTemporaryFile supports the "delete" argument only since 2.6.
* v3.14.0v3.14.0Bob Ippolito2018-04-211-1/+1
|
* Merge pull request #212 from richvdh/rav/defer_is_rawjson_testBob Ippolito2018-04-091-6/+6
|\ | | | | Defer is_raw_json test
| * Defer is_raw_json testRichard van der Hoff2018-04-031-6/+6
| | | | | | | | | | | | Instances of RawJSON are unusual; by moving the test for them to lower in encoder_listencode_obj, we get a 12% performance improvement in my tests by not doing the instanceof test.
* | Remove redundant parts of ESCAPE and ESCAPE_DCTRichard van der Hoff2018-03-291-3/+1
| | | | | | | | | | | | | | * `\b\f\n\r\t` are all in the range `\x00-\x1f` so can be omitted from ESCAPE * `ESCAPE_DCT[0x2028:0x2029]` is no longer used in `encode_basestring`, and `py_encode_basestring_ascii` handles them via the generic `\uNNNN` code, so these entries can be removed from `ESCAPE_DCT`.
* | documentation updatesRichard van der Hoff2018-03-291-1/+1
| |
* | Improve docstring on JSONEncoderForHTMLRichard van der Hoff2018-03-291-0/+5
| | | | | | | | Document the U+2028 and U+2029 behavior.
* | Simplify ESCAPE regexp constructionRichard van der Hoff2018-03-291-4/+1
| | | | | | | | | | Now that we do not include \uNNNN escapes in the regex, we can use a raw string rather than having to double-escape everything.
* | Avoid escaping U+2028 and U+2029 without ensure_asciiRichard van der Hoff2018-03-293-4/+18
|/ | | | | There is no need to escape U+2028 and U+2029 when ensure_ascii is false, and doing so makes us inconsistent with the standard JSON library.
* Update CHANGES.txt and increment version to 3.13.3Bob Ippolito2018-03-271-1/+1
|
* Avoid copying strings when encodingRichard van der Hoff2018-03-272-2/+7
| | | | | | | d782561 introduced a performance regression which means that every string is copied during serialisation, when ensure_ascii is False. This should fix it.
* v3.13.2v3.13.2Bob Ippolito2017-11-241-1/+1
|
* maybe fix windows 2.x buildBob Ippolito2017-11-241-1/+2
|
* v3.13.1v3.13.1Bob Ippolito2017-11-241-1/+1
|
* Fix a compile error on 2.x. Closes #193.speedups-compile-error-2.7Serhiy Storchaka2017-11-241-1/+1
|
* Fix string encoding for Python 2Bob Ippolito2017-11-231-2/+8
|
* Ensure that encoding text subtypes is consistent with or without speedups. ↵Bob Ippolito2017-11-233-6/+18
| | | | Fixes #185
* Merge pull request #191 from simplejson/type-error-messagesBob Ippolito2017-11-234-5/+27
|\ | | | | Make TypeError messages contain type name instead of a repr.
| * Add tests.type-error-messagesSerhiy Storchaka2017-11-231-1/+18
| |
| * Make TypeError messages contain type name instead of a repr.Serhiy Storchaka2017-11-103-4/+9
| | | | | | | | | | | | The failure depends on the type, not on the value of an object. This combines CPython's issues 26623 and 24641.
* | Update version, add *.pyd to gitignoreBob Ippolito2017-11-231-1/+1
| |
* | Workarounds for NamedTemporaryFile issues with Windows for tool testsBob Ippolito2017-11-231-13/+21
| |
* | v3.12.1v3.12.1Bob Ippolito2017-11-231-1/+1
| |
* | Merge pull request #188 from simplejson/bpo-31505Bob Ippolito2017-11-202-3/+42
|\ \ | |/ |/| bpo-31505: Fix an assertion failure in json, in case _json.make_encoder() received a bad encoder() argument.
| * Fix a test.bpo-31505Serhiy Storchaka2017-11-061-3/+1
| |
| * bpo-31505: Fix an assertion failure in json, in case _json.make_encoder() ↵Serhiy Storchaka2017-11-062-3/+44
| | | | | | | | | | | | received a bad encoder() argument. Original patch by Oren Milman.
* | bpo-31095: fix potential crash during GC (#187)Serhiy Storchaka2017-11-061-2/+4
| | | | | | Original patch by INADA Naoki.
* | Fix a reference leak when sort keys. (#186)Serhiy Storchaka2017-11-061-2/+5
|/
* Fix #184 threaded import issue, prep v3.12.0v3.12.0Bob Ippolito2017-11-056-84/+92
|
* v3.11.1fix-173Bob Ippolito2017-06-191-1/+1
|
* Fix #173 with item_sort_key and add auto-discovery to test suiteBob Ippolito2017-06-193-42/+25
|
* v3.11.0v3.11.0Bob Ippolito2017-06-181-1/+1
|
* docstring fix in JSONEncoder: use_decimal defaults to TrueJure Cerjak2017-06-121-1/+1
|
View Lorry Controller Status