summaryrefslogtreecommitdiff
path: root/simplejson
Commit message (Collapse)AuthorAgeFilesLines
* 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
|
* Merge pull request #170 from simplejson/strict-to-boolBob Ippolito2017-06-081-24/+14
|\ | | | | Call PyObject_IsTrue() only once for the strict argument of scanner.
| * Call PyObject_IsTrue() only once for the strict argument of scanner.strict-to-boolSerhiy Storchaka2017-05-211-24/+14
| |
* | Fix a crash wish unencodable encoding in the encoder.unencodable-encoder-encodingSerhiy Storchaka2017-05-212-2/+15
|/ | | | | JSONEncoder.encode() crashed in Python 3 when encoded bytes keys if the encoding was not encodable to utf-8 (contained surrogates).
* Make test_speedups compatible with Python 2.5 and 2.6.Serhiy Storchaka2017-05-211-37/+25
|
* Make test_speedups compatible with Python 2.5.Serhiy Storchaka2017-05-211-0/+2
|
* Added missed ";" in Python 2 only code.Serhiy Storchaka2017-05-211-1/+1
|
* Merge pull request #162 from chrisgavin/unused-importsBob Ippolito2017-05-201-1/+1
|\ | | | | Remove unused imports.
| * Remove unused imports.Chris Gavin2017-04-241-1/+1
| |
* | Merge pull request #168 from simplejson/no-py2.4Bob Ippolito2017-05-203-35/+2
|\ \ | | | | | | Remove remnants of Python 2.4 support.
| * | Remofe remnants of Python 2.4 support.no-py2.4Serhiy Storchaka2017-05-083-35/+2
| |/ | | | | | | Clean up the code by removing workarounds for supporting Python 2.4.
* | Fix argument checking errors in _speedups.c.Serhiy Storchaka2017-05-122-35/+123
| | | | | | | | | | | | | | Always check PyObject_IsTrue() for error. Also fix integer overflow in the int_as_string_bitcount argument. Fixes #167.
* | Don't set tp_new to PyType_GenericNew.remove-init-methodsSerhiy Storchaka2017-05-081-2/+0
| |
* | Remove the `__init__` methods in extension classes.Serhiy Storchaka2017-05-071-76/+31
|/ | | | | | | Calling the `__init__` methods repeatedly causes memory leaks. Not calling the `__init__` methods causes a core dump. Fixes #165. Ported from https://bugs.python.org/issue30243.
* Bump version, update changelog, fix issues identified in code review of #143Bob Ippolito2016-10-284-2/+24
|
View Lorry Controller Status