summaryrefslogtreecommitdiff
path: root/simplejson
Commit message (Collapse)AuthorAgeFilesLines
* 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-201-1/+1
|\ | | | | Remove unused imports.
| * Remove unused imports.Chris Gavin2017-04-241-1/+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.
* | 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.
* Bump version, update changelog, fix issues identified in code review of #143Bob Ippolito2016-10-284-2/+24
|
* 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.
* | Bump version to 3.9.0Bob Ippolito2016-10-211-1/+1
| |
* | Fixes #144. Workaround for bad behavior in string subclasses.Bob Ippolito2016-10-213-1/+26
| |
* | 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
|/ | | | | | | | | | | | | | | | | | | 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 ```
* v3.8.2 - fix compiler warning, automated wheel builds for Windows and Macv3.8.2wheelsBob Ippolito2016-02-152-2/+2
|
* Fix issue with iterable_as_array and indent option, closes #128v3.8.1Bob Ippolito2015-10-273-21/+26
|
* Update version to 3.8.1Bob Ippolito2015-09-041-1/+1
|
* removed from _speedups.c forgotten "iterable_as_array" without comma after ↵Costy Petrisor2015-09-031-1/+0
| | | | string
* clean up iterable_as_array for 3.8.0v3.8.0Bob Ippolito2015-07-182-2/+3
|
* Merge branch 'master' into iterable_as_array-gh1Nick Babcock2015-07-1034-1005/+2864
|\ | | | | | | | | | | | | | | | | | | | | | | Conflicts: CHANGES.txt conf.py index.rst setup.py simplejson/__init__.py simplejson/_speedups.c simplejson/encoder.py simplejson/tests/test_tuple.py
| * fix typo in e18cc09v3.7.3Bob Ippolito2015-05-312-2/+2
| |
| * attempt to work around an issue with reloading the Decimal modulev3.7.2Bob Ippolito2015-05-222-5/+8
| |
| * bump version for #119v3.7.1Bob Ippolito2015-05-181-1/+1
| |
| * Fix msvc error C2275: 'PyObject' : illegal use of this type as an expressionChristoph Gohlke2015-05-181-2/+4
| |
| * no longer trust custom repr for int/long/float subclasses #118v3.7.0Bob Ippolito2015-05-185-5/+91
| |
| * update CHANGES and bump version to v3.6.5v3.6.5Bob Ippolito2014-10-241-1/+1
| |
| * Fix memory leak when an error occurs encoding dict itemsKeith Bussell2014-10-231-0/+1
| |
| * failing test for #106Bob Ippolito2014-09-291-0/+9
| |
| * update version for v3.6.4Bob Ippolito2014-09-291-1/+1
| |
| * ensure cached encoder is only used when all settings are defaultsort_keys_dump-106Bob Ippolito2014-09-241-5/+9
| |
| * documentation about key limitations in JSON per #103v3.6.3Bob Ippolito2014-08-181-1/+1
| |
| * doc updates from http://bugs.python.org/issue21514 re: #102v3.6.2Bob Ippolito2014-08-091-1/+1
| |
| * update documentation per #102docs-102Bob Ippolito2014-08-091-1/+1
| |
| * generalize BOM stripping to any use of raw_decodeBob Ippolito2014-07-214-22/+16
| |
| * strip utf-8 bom.Ryo Takahashi2014-07-213-1/+22
| |
| * Fix lower bound checking in scan_once / raw_decode API #98v3.5.3Bob Ippolito2014-06-245-3/+23
| |
| * update version for v3.5.2v3.5.2Bob Ippolito2014-05-231-1/+1
| |
| * fix build for VS 2008Gabi Davar2014-05-231-1/+1
| |
| * consistently reject int_as_string_bitcount <= 0 #96v3.5.1Bob Ippolito2014-05-224-2/+11
| |
| * detabv3.5.0Bob Ippolito2014-05-211-101/+101
| |
| * clean up #96 and prep for v3.5.0 releaseBob Ippolito2014-05-213-27/+30
| |
| * Merge pull request #96 from coldeasy/int_as_string_bitcountBob Ippolito2014-05-206-118/+282
| |\ | | | | | | Adding `int_as_string_bitcount` option
| | * Allocate int_as_string bounds once per encoderColin Deasy2014-05-202-32/+38
| | |
| | * Adding `int_as_string_bitcount` optionColin Deasy2014-05-146-104/+262
| | |
View Lorry Controller Status