| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | 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 |
| | | | |||||
| * | | Bump version to 3.9.0 | Bob Ippolito | 2016-10-21 | 4 | -6/+6 |
| | | | |||||
| * | | Fixes #144. Workaround for bad behavior in string subclasses. | Bob Ippolito | 2016-10-21 | 4 | -1/+28 |
| | | | |||||
| * | | Update Python versions used for Mac builds | Bob Ippolito | 2016-10-21 | 1 | -2/+2 |
| | | | |||||
| * | | Another attempt to fix Travis Mac build | Bob Ippolito | 2016-10-21 | 1 | -4/+7 |
| | | | |||||
| * | | Update CHANGES.txt | Bob Ippolito | 2016-10-21 | 1 | -0/+9 |
| | | | |||||
| * | | Merge pull request #146 from rowillia/master | Bob Ippolito | 2016-09-26 | 2 | -13/+11 |
| |\ \ | | | | | | | Fix problems identified by `-3` flag when running in Python 2.7 | ||||
| | * | | Remove fromhex all together | Roy Williams | 2016-09-22 | 2 | -17/+11 |
| | | | | |||||
| | * | | Add support for Python 2.5 | Roy Williams | 2016-09-22 | 1 | -2/+6 |
| | | | | |||||
| | * | | Use binascii instead of codecs | Roy Williams | 2016-09-22 | 1 | -4/+3 |
| | | | | |||||
| | * | | Use `codecs.decode` in Python 2 as opposed to `str.decode` in Python 2. | Roy Williams | 2016-09-21 | 1 | -2/+3 |
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I am investigating a migration to Python 3, and to facilitate this we are using the `-3` flag as decribed here: https://docs.python.org/3/howto/pyporting.html#prevent-compatibility-regressions . When using this flag, I get warnings from simplejson about the use of decode. While obviously this is a invalid warning since this code is gated in Python 2, committing this change will allow users to run their code in `-3` mode in Python 2 without warnings from simplejson. Microbenchmarking this change with `timeit` also reveals it's faster! ```py >>> import timeit >>> timeit.timeit("decode_hex('4f6c6567')[0]", setup="import codecs; decode_hex = codecs.getdecoder('hex_codec')") 0.6572110652923584 >>> timeit.timeit("'4f6c6567'.decode('hex')") 0.9076640605926514 ``` | ||||
| * | | See if we can get those OS X builds working | Bob Ippolito | 2016-09-25 | 1 | -0/+2 |
| |/ | |||||
| * | Merge pull request #137 from adamchainz/readthedocs.io | Bob Ippolito | 2016-05-30 | 2 | -2/+2 |
| |\ | | | | | Convert readthedocs link for their .org -> .io migration for hosted projects | ||||
| | * | Convert readthedocs link for their .org -> .io migration for hosted projects | Adam Chainz | 2016-05-29 | 2 | -2/+2 |
| |/ | | | | | | | | As per their email ‘Changes to project subdomains’: > Starting today, Read the Docs will start hosting projects from subdomains on the domain readthedocs.io, instead of on readthedocs.org. This change addresses some security concerns around site cookies while hosting user generated data on the same domain as our dashboard. Test Plan: Manually visited all the links I’ve modified. | ||||
| * | Merge pull request #134 from compwron/rst_readme_build_status | Bob Ippolito | 2016-03-12 | 1 | -0/+7 |
| |\ | | | | | add build status badge and github-visible python2.2 link to readme | ||||
| | * | Readme badge and py2 link | lgoldstein | 2016-03-09 | 1 | -0/+7 |
| |/ | |||||
| * | fix artifacts script | Bob Ippolito | 2016-02-15 | 1 | -2/+2 |
| | | |||||
| * | v3.8.2 - fix compiler warning, automated wheel builds for Windows and Macv3.8.2wheels | Bob Ippolito | 2016-02-15 | 9 | -14/+139 |
| | | |||||
| * | Merge pull request #130 from aebrahim/appveyor | Bob Ippolito | 2015-11-22 | 3 | -0/+232 |
| |\ | | | | | build windows wheels on appveyor | ||||
| | * | build windows wheels on appveyor | Ali Ebrahim | 2015-11-22 | 3 | -0/+232 |
| |/ | |||||
| * | Add Python 3.5 to Travis test suite | Bob Ippolito | 2015-10-27 | 1 | -0/+1 |
| | | |||||
 |
index : delta/simplejson.git | |
| github.com: simplejson/simplejson.git |
| summaryrefslogtreecommitdiff |