summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Support builds without cStringIO.cStringIOSerhiy Storchaka2018-04-252-6/+13
* Merge pull request #216 from simplejson/bytes-encodingBob Ippolito2018-04-244-21/+125
|\
| * Allow to disable serializing bytes by default in Python 3.bytes-encodingSerhiy Storchaka2018-04-254-21/+125
|/
* Merge pull request #215 from simplejson/compatBob Ippolito2018-04-247-36/+29
|\
| * Simplify compatibility code.compatSerhiy Storchaka2018-04-247-36/+29
* | Merge pull request #214 from simplejson/tempfile-py25Bob Ippolito2018-04-241-9/+18
|\ \ | |/ |/|
| * Fix tests in Python 2.5.tempfile-py25Serhiy Storchaka2018-04-241-9/+18
|/
* v3.14.0v3.14.0Bob Ippolito2018-04-214-6/+10
* 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
* | Merge pull request #211 from richvdh/rav/fix_linebreak_encodingBob Ippolito2018-04-024-8/+27
|\ \ | |/ |/|
| * Remove redundant parts of ESCAPE and ESCAPE_DCTRichard van der Hoff2018-03-291-3/+1
| * documentation updatesRichard van der Hoff2018-03-292-4/+4
| * Update documentation for JSONEncoderForHTMLRichard van der Hoff2018-03-291-0/+5
| * 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-274-3/+8
* Merge pull request #210 from richvdh/rav/avoid_string_copyBob Ippolito2018-03-272-2/+7
|\
| * Avoid copying strings when encodingRichard van der Hoff2018-03-272-2/+7
|/
* Merge pull request #199 from simplejson/setup-classifiersBob Ippolito2017-12-101-20/+19
|\
| * The classifier parameter in setup.py must be a list.setup-classifiersSerhiy Storchaka2017-12-031-20/+19
|/
* v3.13.2v3.13.2Bob Ippolito2017-11-244-3/+7
* maybe fix windows 2.x buildBob Ippolito2017-11-241-1/+2
* v3.13.1v3.13.1Bob Ippolito2017-11-244-3/+9
* fail build in CI if speedups do not build correctlyBob Ippolito2017-11-243-2/+5
* Merge pull request #194 from simplejson/speedups-compile-error-2.7Bob Ippolito2017-11-241-1/+1
|\
| * Fix a compile error on 2.x. Closes #193.speedups-compile-error-2.7Serhiy Storchaka2017-11-241-1/+1
|/
* also upload tarballBob Ippolito2017-11-231-1/+1
* build sdist from travisBob Ippolito2017-11-232-2/+9
* fix artifact matchingv3.13.0Bob Ippolito2017-11-231-13/+26
* fix appveyor.ymlBob Ippolito2017-11-231-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-236-10/+24
* update CHANGESBob Ippolito2017-11-231-3/+5
* 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 appveyor configBob Ippolito2017-11-231-1/+4
* | Update version, add *.pyd to gitignoreBob Ippolito2017-11-235-3/+8
* | Workarounds for NamedTemporaryFile issues with Windows for tool testsBob Ippolito2017-11-231-13/+21
* | v3.12.1v3.12.1Bob Ippolito2017-11-234-3/+13
* | update artifacts.py to avoid none-any wheelsBob Ippolito2017-11-231-9/+23
* | added editorconfigBob Ippolito2017-11-231-0/+11
* | Merge pull request #188 from simplejson/bpo-31505Bob Ippolito2017-11-202-3/+42
|\ \ | |/ |/|
| * Fix a test.bpo-31505Serhiy Storchaka2017-11-061-3/+1
| * bpo-31505: Fix an assertion failure in json, in case _json.make_encoder() rec...Serhiy Storchaka2017-11-062-3/+44
* | bpo-31095: fix potential crash during GC (#187)Serhiy Storchaka2017-11-061-2/+4
* | Fix a reference leak when sort keys. (#186)Serhiy Storchaka2017-11-061-2/+5
|/
* Add Python 3.6.3 to appveyorBob Ippolito2017-11-051-2/+10