summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* 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
|
* Add Python 3.6.3 to appveyorBob Ippolito2017-11-051-2/+10
|
* Fix #184 threaded import issue, prep v3.12.0v3.12.0Bob Ippolito2017-11-059-87/+102
|
* see if pypy will install without dist: trustyBob Ippolito2017-07-081-2/+0
|
* newer versions are not in pyenv for some reasonBob Ippolito2017-07-081-2/+2
|
* sudo: falseBob Ippolito2017-07-081-0/+8
|
* Add pypy3 and update osx python versionsBob Ippolito2017-07-081-2/+5
|
* Merge pull request #179 from taleinat/patch-1Bob Ippolito2017-07-081-1/+1
|\ | | | | setup.py: fix condition for build_ext exception types
| * setup.py: fix condition for build_ext exception typesTal Einat2017-06-281-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-typoBob Ippolito2017-07-081-1/+1
|\ \ | |/ |/| Fix a typo: verison -> version
| * Fix a typo: verison -> versionFelix Yan2017-07-011-1/+1
| |
* | Merge pull request #176 from simplejson/fix-173v3.11.1Bob Ippolito2017-06-197-46/+35
|\ \ | |/ |/| Fix #173 with item_sort_key and add auto-discovery to test suite
| * v3.11.1fix-173Bob Ippolito2017-06-193-4/+4
| |
| * Fix #173 with item_sort_key and add auto-discovery to test suiteBob Ippolito2017-06-194-42/+31
|/
* v3.11.0v3.11.0Bob Ippolito2017-06-184-4/+26
|
* Merge pull request #172 from jcerjak/docstring-fix-for-use_decimalBob Ippolito2017-06-121-1/+1
|\ | | | | docstring fix in JSONEncoder: use_decimal defaults to True
| * 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
| |
* | Merge pull request #171 from simplejson/unencodable-encoder-encodingBob Ippolito2017-06-082-2/+15
|\ \ | |/ |/| Fix a crash wish unencodable encoding in the encoder.
| * 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-203-4/+1
|\ | | | | Remove unused imports.
| * Remove unused imports.Chris Gavin2017-04-243-4/+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.
* | Merge pull request #169 from simplejson/check-is-trueBob Ippolito2017-05-202-35/+123
|\ \ | | | | | | Fix argument checking errors in _speedups.c.
| * \ Merge branch 'master' into check-is-truecheck-is-trueSerhiy Storchaka2017-05-201-1/+1
| |\ \ | |/ / |/| |
* | | Merge pull request #166 from simplejson/remove-init-methodsBob Ippolito2017-05-181-78/+31
|\ \ \ | | | | | | | | Remove the `__init__` methods in extension classes.
* | | | Fix a typo in the doc for loads (#161).Serhiy Storchaka2017-05-081-1/+1
| |_|/ |/| |
| | * 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.
* Merge pull request #153 from hugovk/patch-1Bob Ippolito2017-01-171-0/+2
|\ | | | | Update Python versions
| * Update Python versionsHugo2017-01-171-0/+2
|/
* Merge pull request #152 from hugovk/patch-1Bob Ippolito2017-01-161-0/+3
|\ | | | | Python 3.6 is out
| * Python 3.6 is outHugo2017-01-161-0/+3
|/
* v3.10.0v3.10.0Bob Ippolito2016-10-281-1/+1
|
* Merge branch 'lamflam-raw_json'Bob Ippolito2016-10-288-5/+94
|\
| * Bump version, update changelog, fix issues identified in code review of #143Bob Ippolito2016-10-287-5/+32
| |
| * Merge branch 'raw_json' of https://github.com/lamflam/simplejson into ↵Bob Ippolito2016-10-284-1/+63
| |\ |/ / | | | | lamflam-raw_json
| * Add support for preprocessed JSON strings (with optimizations) in encoderKevin LaFlamme2016-09-014-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 runBob Ippolito2016-10-231-1/+2
| |
* | rehash before and after evalBob Ippolito2016-10-231-0/+1
| |
* | Only upload exe and whl filesBob Ippolito2016-10-221-1/+1
| |