Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix a compile error on 2.x. Closes #193.speedups-compile-error-2.7 | Serhiy Storchaka | 2017-11-24 | 1 | -1/+1 |
| | |||||
* | also upload tarball | Bob Ippolito | 2017-11-23 | 1 | -1/+1 |
| | |||||
* | build sdist from travis | Bob Ippolito | 2017-11-23 | 2 | -2/+9 |
| | |||||
* | fix artifact matchingv3.13.0 | Bob Ippolito | 2017-11-23 | 1 | -13/+26 |
| | |||||
* | fix appveyor.yml | Bob Ippolito | 2017-11-23 | 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 | 6 | -10/+24 |
| | | | | Fixes #185 | ||||
* | update CHANGES | Bob Ippolito | 2017-11-23 | 1 | -3/+5 |
| | |||||
* | 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 appveyor config | Bob Ippolito | 2017-11-23 | 1 | -1/+4 |
| | | |||||
* | | Update version, add *.pyd to gitignore | Bob Ippolito | 2017-11-23 | 5 | -3/+8 |
| | | |||||
* | | 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 | 4 | -3/+13 |
| | | |||||
* | | update artifacts.py to avoid none-any wheels | Bob Ippolito | 2017-11-23 | 1 | -9/+23 |
| | | |||||
* | | added editorconfig | Bob Ippolito | 2017-11-23 | 1 | -0/+11 |
| | | |||||
* | | 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 |
|/ | |||||
* | 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. |