summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |\ | | | | | | Bypass the decode() method in bytes subclasses.
| | * 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
|\ \ \ | |/ /
| * | Merge pull request #217 from simplejson/cStringIOBob Ippolito2018-04-252-6/+13
| |\ \ | | |/ | |/| Support builds without cStringIO.
| | * 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.
* Merge pull request #216 from simplejson/bytes-encodingBob Ippolito2018-04-244-21/+125
|\ | | | | Allow to disable serializing bytes by default in Python 3.
| * Allow to disable serializing bytes by default in Python 3.bytes-encodingSerhiy Storchaka2018-04-254-21/+125
|/ | | | | 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.
* | Merge pull request #214 from simplejson/tempfile-py25Bob Ippolito2018-04-241-9/+18
|\ \ | |/ |/| Fix tests in Python 2.5.
| * 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-214-6/+10
|
* 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.
* | Merge pull request #211 from richvdh/rav/fix_linebreak_encodingBob Ippolito2018-04-024-8/+27
|\ \ | |/ |/| Avoid escaping U+2028 and U+2029 without ensure_ascii
| * 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-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
| | | | | | | | 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-274-3/+8
|
* Merge pull request #210 from richvdh/rav/avoid_string_copyBob Ippolito2018-03-272-2/+7
|\ | | | | Avoid copying strings when encoding
| * 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.
* Merge pull request #199 from simplejson/setup-classifiersBob Ippolito2017-12-101-20/+19
|\ | | | | The classifier parameter in setup.py must be a list.
| * 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.
| * 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. ↵Bob Ippolito2017-11-236-10/+24
| | | | Fixes #185
* update CHANGESBob Ippolito2017-11-231-3/+5
|
* 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 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
| |
View Lorry Controller Status