Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Simplify compatibility code.compat | Serhiy Storchaka | 2018-04-24 | 7 | -36/+29 |
| | | | | | Since minimal supported Python 3 version is 3.3, the u() helper no longer needed. | ||||
* | v3.14.0v3.14.0 | Bob Ippolito | 2018-04-21 | 1 | -1/+1 |
| | |||||
* | Merge pull request #212 from richvdh/rav/defer_is_rawjson_test | Bob Ippolito | 2018-04-09 | 1 | -6/+6 |
|\ | | | | | Defer is_raw_json test | ||||
| * | Defer is_raw_json test | Richard van der Hoff | 2018-04-03 | 1 | -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_DCT | Richard van der Hoff | 2018-03-29 | 1 | -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 updates | Richard van der Hoff | 2018-03-29 | 1 | -1/+1 |
| | | |||||
* | | Improve docstring on JSONEncoderForHTML | Richard van der Hoff | 2018-03-29 | 1 | -0/+5 |
| | | | | | | | | Document the U+2028 and U+2029 behavior. | ||||
* | | Simplify ESCAPE regexp construction | Richard van der Hoff | 2018-03-29 | 1 | -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_ascii | Richard van der Hoff | 2018-03-29 | 3 | -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.3 | Bob Ippolito | 2018-03-27 | 1 | -1/+1 |
| | |||||
* | Avoid copying strings when encoding | Richard van der Hoff | 2018-03-27 | 2 | -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.2 | Bob Ippolito | 2017-11-24 | 1 | -1/+1 |
| | |||||
* | maybe fix windows 2.x build | Bob Ippolito | 2017-11-24 | 1 | -1/+2 |
| | |||||
* | v3.13.1v3.13.1 | Bob Ippolito | 2017-11-24 | 1 | -1/+1 |
| | |||||
* | Fix a compile error on 2.x. Closes #193.speedups-compile-error-2.7 | Serhiy Storchaka | 2017-11-24 | 1 | -1/+1 |
| | |||||
* | Fix string encoding for Python 2 | Bob Ippolito | 2017-11-23 | 1 | -2/+8 |
| | |||||
* | Ensure that encoding text subtypes is consistent with or without speedups. ↵ | Bob Ippolito | 2017-11-23 | 3 | -6/+18 |
| | | | | Fixes #185 | ||||
* | Merge pull request #191 from simplejson/type-error-messages | Bob Ippolito | 2017-11-23 | 4 | -5/+27 |
|\ | | | | | Make TypeError messages contain type name instead of a repr. | ||||
| * | Add tests.type-error-messages | Serhiy Storchaka | 2017-11-23 | 1 | -1/+18 |
| | | |||||
| * | Make TypeError messages contain type name instead of a repr. | Serhiy Storchaka | 2017-11-10 | 3 | -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 gitignore | Bob Ippolito | 2017-11-23 | 1 | -1/+1 |
| | | |||||
* | | Workarounds for NamedTemporaryFile issues with Windows for tool tests | Bob Ippolito | 2017-11-23 | 1 | -13/+21 |
| | | |||||
* | | v3.12.1v3.12.1 | Bob Ippolito | 2017-11-23 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #188 from simplejson/bpo-31505 | Bob Ippolito | 2017-11-20 | 2 | -3/+42 |
|\ \ | |/ |/| | bpo-31505: Fix an assertion failure in json, in case _json.make_encoder() received a bad encoder() argument. | ||||
| * | Fix a test.bpo-31505 | Serhiy Storchaka | 2017-11-06 | 1 | -3/+1 |
| | | |||||
| * | bpo-31505: Fix an assertion failure in json, in case _json.make_encoder() ↵ | Serhiy Storchaka | 2017-11-06 | 2 | -3/+44 |
| | | | | | | | | | | | | received a bad encoder() argument. Original patch by Oren Milman. | ||||
* | | bpo-31095: fix potential crash during GC (#187) | Serhiy Storchaka | 2017-11-06 | 1 | -2/+4 |
| | | | | | | Original patch by INADA Naoki. | ||||
* | | Fix a reference leak when sort keys. (#186) | Serhiy Storchaka | 2017-11-06 | 1 | -2/+5 |
|/ | |||||
* | Fix #184 threaded import issue, prep v3.12.0v3.12.0 | Bob Ippolito | 2017-11-05 | 6 | -84/+92 |
| | |||||
* | v3.11.1fix-173 | Bob Ippolito | 2017-06-19 | 1 | -1/+1 |
| | |||||
* | Fix #173 with item_sort_key and add auto-discovery to test suite | Bob Ippolito | 2017-06-19 | 3 | -42/+25 |
| | |||||
* | v3.11.0v3.11.0 | Bob Ippolito | 2017-06-18 | 1 | -1/+1 |
| | |||||
* | docstring fix in JSONEncoder: use_decimal defaults to True | Jure Cerjak | 2017-06-12 | 1 | -1/+1 |
| | |||||
* | Merge pull request #170 from simplejson/strict-to-bool | Bob Ippolito | 2017-06-08 | 1 | -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-bool | Serhiy Storchaka | 2017-05-21 | 1 | -24/+14 |
| | | |||||
* | | Fix a crash wish unencodable encoding in the encoder.unencodable-encoder-encoding | Serhiy Storchaka | 2017-05-21 | 2 | -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 Storchaka | 2017-05-21 | 1 | -37/+25 |
| | |||||
* | Make test_speedups compatible with Python 2.5. | Serhiy Storchaka | 2017-05-21 | 1 | -0/+2 |
| | |||||
* | Added missed ";" in Python 2 only code. | Serhiy Storchaka | 2017-05-21 | 1 | -1/+1 |
| | |||||
* | Merge pull request #162 from chrisgavin/unused-imports | Bob Ippolito | 2017-05-20 | 1 | -1/+1 |
|\ | | | | | Remove unused imports. | ||||
| * | Remove unused imports. | Chris Gavin | 2017-04-24 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #168 from simplejson/no-py2.4 | Bob Ippolito | 2017-05-20 | 3 | -35/+2 |
|\ \ | | | | | | | Remove remnants of Python 2.4 support. | ||||
| * | | Remofe remnants of Python 2.4 support.no-py2.4 | Serhiy Storchaka | 2017-05-08 | 3 | -35/+2 |
| |/ | | | | | | | Clean up the code by removing workarounds for supporting Python 2.4. | ||||
* | | Fix argument checking errors in _speedups.c. | Serhiy Storchaka | 2017-05-12 | 2 | -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-methods | Serhiy Storchaka | 2017-05-08 | 1 | -2/+0 |
| | | |||||
* | | Remove the `__init__` methods in extension classes. | Serhiy Storchaka | 2017-05-07 | 1 | -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 #143 | Bob Ippolito | 2016-10-28 | 4 | -2/+24 |
| | |||||
* | Merge branch 'raw_json' of https://github.com/lamflam/simplejson into ↵ | Bob Ippolito | 2016-10-28 | 4 | -1/+63 |
|\ | | | | | | | lamflam-raw_json | ||||
| * | Add support for preprocessed JSON strings (with optimizations) in encoder | Kevin LaFlamme | 2016-09-01 | 4 | -1/+63 |
| | | | | | | | | In some situations, you may have a large python dictionary you need to JSONify but one of the values inside the dict is already a JSON string. This is common when pulling an object from a database, for example, where one of the fields is a JSON blob/string. Previously you would have to deserialize and then reserialize that string just to serialize the high level object, but obviously this is unnecessarily slow. This changes adds a method/type that can be used to wrap a str and tell the serializer to just pass it through instead. | ||||
* | | Bump version to 3.9.0 | Bob Ippolito | 2016-10-21 | 1 | -1/+1 |
| | |