summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Prep for v3.16.1 and add JSON lines examplejson-lines-exampleBob Ippolito2018-09-066-29/+54
* Merge pull request #235 from simplejson/felixonmars-patch-1-1Bob Ippolito2018-09-041-1/+1
|\
| * Update appveyor.ymlfelixonmars-patch-1-1Felix Yan2018-09-051-1/+1
|/
* Merge pull request #233 from simplejson/travis-py37Bob Ippolito2018-09-042-2/+12
|\
| * pyenv on osx is not up to date yetBob Ippolito2018-09-041-5/+2
| * Merge branch 'master' into travis-py37Bob Ippolito2018-09-041-5/+13
| |\ | |/ |/|
* | Merge pull request #234 from simplejson/appveyor-py37Bob Ippolito2018-09-041-5/+13
|\ \
| * | Add Python 3.7 to appveyorBob Ippolito2018-09-041-5/+13
|/ /
| * Change pyenv clone URLBob Ippolito2018-09-041-1/+1
| * Use xenial distro for Python 3.7Bob Ippolito2018-09-041-1/+1
| * Add Python 3.7 to TravisBob Ippolito2018-09-041-1/+14
|/
* Merge pull request #231 from ushuz/manylinux1-wheelsBob Ippolito2018-09-033-2/+12
|\
| * Build manylinux1 wheels with cibuildwheel 0.9.4John Hu2018-09-033-2/+12
|/
* Update CHANGES for v3.16.0v3.16.0Bob Ippolito2018-06-284-4/+14
* Merge pull request #225 from benjaminp/empty-strBob Ippolito2018-06-272-7/+10
|\
| * 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
|/
* Merge pull request #224 from hugovk/python_requiresBob Ippolito2018-06-191-2/+5
|\
| * Add python_requires to help pipHugo2018-06-191-0/+3
| * http -> httpsHugo2018-06-191-2/+2
|/
* Merge pull request #222 from simplejson/doc-css-fix-gh-221Bob Ippolito2018-06-041-1/+1
|\
| * Fix #221. Allow Sphinx to set css file namedoc-css-fix-gh-221Bob Ippolito2018-06-041-1/+1
|/
* v3.15.0v3.15.0Bob Ippolito2018-05-124-4/+19
* Merge pull request #220 from simplejson/speedups-cleanupBob Ippolito2018-05-121-141/+105
|\
| * Merge branch 'master' into speedups-cleanupspeedups-cleanupBob Ippolito2018-04-254-15/+76
| |\ | |/ |/|
* | Merge pull request #219 from simplejson/str-decodeBob 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
| | |\ | |_|/ |/| |
* | | Merge pull request #217 from simplejson/cStringIOBob 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
|/
* 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