Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix a reference leak when sort keys.sort-refleak | Serhiy Storchaka | 2017-11-06 | 1 | -2/+5 |
| | |||||
* | Add Python 3.6.3 to appveyor | Bob Ippolito | 2017-11-05 | 1 | -2/+10 |
| | |||||
* | Fix #184 threaded import issue, prep v3.12.0v3.12.0 | Bob Ippolito | 2017-11-05 | 9 | -87/+102 |
| | |||||
* | see if pypy will install without dist: trusty | Bob Ippolito | 2017-07-08 | 1 | -2/+0 |
| | |||||
* | newer versions are not in pyenv for some reason | Bob Ippolito | 2017-07-08 | 1 | -2/+2 |
| | |||||
* | sudo: false | Bob Ippolito | 2017-07-08 | 1 | -0/+8 |
| | |||||
* | Add pypy3 and update osx python versions | Bob Ippolito | 2017-07-08 | 1 | -2/+5 |
| | |||||
* | Merge pull request #179 from taleinat/patch-1 | Bob Ippolito | 2017-07-08 | 1 | -1/+1 |
|\ | | | | | setup.py: fix condition for build_ext exception types | ||||
| * | setup.py: fix condition for build_ext exception types | Tal Einat | 2017-06-28 | 1 | -1/+1 |
| | | | | | | The comment states that IOError and ValueError can be thrown in Python 2.6. The referenced CPython issue supports this, it seems to have been resolved in version 2.7. However, the code seems to have the condition backwards, and will only catch IOError or ValueError in versions *greater* than 2.6. | ||||
* | | Merge pull request #180 from felixonmars/fix-typo | Bob Ippolito | 2017-07-08 | 1 | -1/+1 |
|\ \ | |/ |/| | Fix a typo: verison -> version | ||||
| * | Fix a typo: verison -> version | Felix Yan | 2017-07-01 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #176 from simplejson/fix-173v3.11.1 | Bob Ippolito | 2017-06-19 | 7 | -46/+35 |
|\ \ | |/ |/| | Fix #173 with item_sort_key and add auto-discovery to test suite | ||||
| * | v3.11.1fix-173 | Bob Ippolito | 2017-06-19 | 3 | -4/+4 |
| | | |||||
| * | Fix #173 with item_sort_key and add auto-discovery to test suite | Bob Ippolito | 2017-06-19 | 4 | -42/+31 |
|/ | |||||
* | v3.11.0v3.11.0 | Bob Ippolito | 2017-06-18 | 4 | -4/+26 |
| | |||||
* | Merge pull request #172 from jcerjak/docstring-fix-for-use_decimal | Bob Ippolito | 2017-06-12 | 1 | -1/+1 |
|\ | | | | | docstring fix in JSONEncoder: use_decimal defaults to True | ||||
| * | 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 |
| | | |||||
* | | Merge pull request #171 from simplejson/unencodable-encoder-encoding | Bob Ippolito | 2017-06-08 | 2 | -2/+15 |
|\ \ | |/ |/| | Fix a crash wish unencodable encoding in the encoder. | ||||
| * | 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 | 3 | -4/+1 |
|\ | | | | | Remove unused imports. | ||||
| * | Remove unused imports. | Chris Gavin | 2017-04-24 | 3 | -4/+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. | ||||
* | | Merge pull request #169 from simplejson/check-is-true | Bob Ippolito | 2017-05-20 | 2 | -35/+123 |
|\ \ | | | | | | | Fix argument checking errors in _speedups.c. | ||||
| * \ | Merge branch 'master' into check-is-truecheck-is-true | Serhiy Storchaka | 2017-05-20 | 1 | -1/+1 |
| |\ \ | |/ / |/| | | |||||
* | | | Merge pull request #166 from simplejson/remove-init-methods | Bob Ippolito | 2017-05-18 | 1 | -78/+31 |
|\ \ \ | | | | | | | | | Remove the `__init__` methods in extension classes. | ||||
* | | | | Fix a typo in the doc for loads (#161). | Serhiy Storchaka | 2017-05-08 | 1 | -1/+1 |
| |_|/ |/| | | |||||
| | * | 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. | ||||
* | Merge pull request #153 from hugovk/patch-1 | Bob Ippolito | 2017-01-17 | 1 | -0/+2 |
|\ | | | | | Update Python versions | ||||
| * | Update Python versions | Hugo | 2017-01-17 | 1 | -0/+2 |
|/ | |||||
* | Merge pull request #152 from hugovk/patch-1 | Bob Ippolito | 2017-01-16 | 1 | -0/+3 |
|\ | | | | | Python 3.6 is out | ||||
| * | Python 3.6 is out | Hugo | 2017-01-16 | 1 | -0/+3 |
|/ | |||||
* | v3.10.0v3.10.0 | Bob Ippolito | 2016-10-28 | 1 | -1/+1 |
| | |||||
* | Merge branch 'lamflam-raw_json' | Bob Ippolito | 2016-10-28 | 8 | -5/+94 |
|\ | |||||
| * | Bump version, update changelog, fix issues identified in code review of #143 | Bob Ippolito | 2016-10-28 | 7 | -5/+32 |
| | | |||||
| * | 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. | ||||
* | | use correct pyenv in run | Bob Ippolito | 2016-10-23 | 1 | -1/+2 |
| | | |||||
* | | rehash before and after eval | Bob Ippolito | 2016-10-23 | 1 | -0/+1 |
| | | |||||
* | | Only upload exe and whl files | Bob Ippolito | 2016-10-22 | 1 | -1/+1 |
| | | |||||
* | | add signing and uploading artifacts to the script | Bob Ippolito | 2016-10-21 | 1 | -0/+33 |
| | | |||||
* | | remove unnecessary URL | Bob Ippolito | 2016-10-21 | 1 | -1/+0 |
| | | |||||
* | | v3.9.0v3.9.0 | Bob Ippolito | 2016-10-21 | 1 | -1/+1 |
| | |