summaryrefslogtreecommitdiff
path: root/simplejson
Commit message (Expand)AuthorAgeFilesLines
* Upgrade cibuildwheel to v2.1.1test-v3.17.4Bob Ippolito2021-08-191-1/+1
* Replace travis and appveyor with github actionsBob Ippolito2021-07-093-20/+44
* docs: fix simple typo, precendence -> precedenceTim Gates2020-12-291-1/+1
* v3.17.2v3.17.2Bob Ippolito2020-07-161-1/+1
* v3.17.1v3.17.1Bob Ippolito2020-07-161-1/+1
* Set version back to v3.17.0v3.17.0Bob Ippolito2019-11-171-1/+1
* Bump version to v3.18.0 to work around build issuesBob Ippolito2019-11-171-1/+1
* Finish updating docs to be Python 3-centricBob Ippolito2019-11-171-30/+17
* 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
* 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
* | | Merge branch 'master' into speedups-cleanupBob Ippolito2018-04-252-6/+13
|\ \ \ | | |/ | |/|
| * | Support builds without cStringIO.cStringIOSerhiy Storchaka2018-04-252-6/+13
| |/
* | Clean up the C code.Serhiy Storchaka2018-04-251-141/+105
|/
* Allow to disable serializing bytes by default in Python 3.bytes-encodingSerhiy Storchaka2018-04-253-17/+107
* Merge pull request #215 from simplejson/compatBob Ippolito2018-04-247-36/+29
|\
| * Simplify compatibility code.compatSerhiy Storchaka2018-04-247-36/+29
* | Fix tests in Python 2.5.tempfile-py25Serhiy Storchaka2018-04-241-9/+18
|/
* 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 testRichard van der Hoff2018-04-031-6/+6
* | Remove redundant parts of ESCAPE and ESCAPE_DCTRichard van der Hoff2018-03-291-3/+1
* | documentation updatesRichard van der Hoff2018-03-291-1/+1
* | Improve docstring on JSONEncoderForHTMLRichard van der Hoff2018-03-291-0/+5
* | Simplify ESCAPE regexp constructionRichard van der Hoff2018-03-291-4/+1
* | Avoid escaping U+2028 and U+2029 without ensure_asciiRichard van der Hoff2018-03-293-4/+18
|/
* 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
* 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. Fi...Bob Ippolito2017-11-233-6/+18
* Merge pull request #191 from simplejson/type-error-messagesBob Ippolito2017-11-234-5/+27
|\
| * 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
* | 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
|\ \ | |/ |/|
| * Fix a test.bpo-31505Serhiy Storchaka2017-11-061-3/+1