summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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 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.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.unencodable-encoder-encodingSerhiy Storchaka2017-05-212-2/+15
|/
* 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.Chris Gavin2017-04-243-4/+1
* | Merge pull request #168 from simplejson/no-py2.4Bob Ippolito2017-05-203-35/+2
|\ \
| * | Remofe remnants of Python 2.4 support.no-py2.4Serhiy Storchaka2017-05-083-35/+2
| |/
* | Merge pull request #169 from simplejson/check-is-trueBob Ippolito2017-05-202-35/+123
|\ \
| * \ 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
|\ \ \
* | | | 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
| |/
| * 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
|/
* Merge pull request #153 from hugovk/patch-1Bob Ippolito2017-01-171-0/+2
|\
| * Update Python versionsHugo2017-01-171-0/+2
|/
* Merge pull request #152 from hugovk/patch-1Bob Ippolito2017-01-161-0/+3
|\
| * 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 lamflam...Bob Ippolito2016-10-284-1/+63
| |\ |/ /
| * Add support for preprocessed JSON strings (with optimizations) in encoderKevin LaFlamme2016-09-014-1/+63
* | 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
* | add signing and uploading artifacts to the scriptBob Ippolito2016-10-211-0/+33
* | remove unnecessary URLBob Ippolito2016-10-211-1/+0
* | v3.9.0v3.9.0Bob Ippolito2016-10-211-1/+1
* | Bump version to 3.9.0Bob Ippolito2016-10-214-6/+6
* | Fixes #144. Workaround for bad behavior in string subclasses.Bob Ippolito2016-10-214-1/+28
* | Update Python versions used for Mac buildsBob Ippolito2016-10-211-2/+2
* | Another attempt to fix Travis Mac buildBob Ippolito2016-10-211-4/+7
* | Update CHANGES.txtBob Ippolito2016-10-211-0/+9
* | Merge pull request #146 from rowillia/masterBob Ippolito2016-09-262-13/+11
|\ \
| * | Remove fromhex all togetherRoy Williams2016-09-222-17/+11
| * | Add support for Python 2.5Roy Williams2016-09-221-2/+6
| * | Use binascii instead of codecsRoy Williams2016-09-221-4/+3
| * | Use `codecs.decode` in Python 2 as opposed to `str.decode` in Python 2.Roy Williams2016-09-211-2/+3
| |/
* | See if we can get those OS X builds workingBob Ippolito2016-09-251-0/+2
|/
* Merge pull request #137 from adamchainz/readthedocs.ioBob Ippolito2016-05-302-2/+2
|\