Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Fix issue with iterable_as_array and indent option, closes #128v3.8.1 | Bob Ippolito | 2015-10-27 | 4 | -22/+29 | |
| | ||||||
* | Update version to 3.8.1 | Bob Ippolito | 2015-09-04 | 4 | -4/+9 | |
| | ||||||
* | Merge pull request #123 from ↵ | Bob Ippolito | 2015-09-04 | 1 | -1/+0 | |
|\ | | | | | | | | | costypetrisor/fix-int_as_string_bitcount-from-speedups removed from _speedups.c forgotten "iterable_as_array" without comma after string | |||||
| * | removed from _speedups.c forgotten "iterable_as_array" without comma after ↵ | Costy Petrisor | 2015-09-03 | 1 | -1/+0 | |
|/ | | | | string | |||||
* | clean up iterable_as_array for 3.8.0v3.8.0 | Bob Ippolito | 2015-07-18 | 6 | -12/+13 | |
| | ||||||
* | Merge branch 'master' into iterable_as_array-gh1 | Nick Babcock | 2015-07-10 | 43 | -1112/+3742 | |
|\ | | | | | | | | | | | | | | | | | | | | | | | 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.3 | Bob Ippolito | 2015-05-31 | 5 | -4/+9 | |
| | | ||||||
| * | attempt to work around an issue with reloading the Decimal modulev3.7.2 | Bob Ippolito | 2015-05-22 | 5 | -8/+16 | |
| | | ||||||
| * | bump version for #119v3.7.1 | Bob Ippolito | 2015-05-18 | 4 | -3/+8 | |
| | | ||||||
| * | Merge pull request #119 from cgohlke/patch-1 | Bob Ippolito | 2015-05-18 | 1 | -2/+4 | |
| |\ | | | | | | | _speedups.c fails to compile with msvc | |||||
| | * | Fix msvc error C2275: 'PyObject' : illegal use of this type as an expression | Christoph Gohlke | 2015-05-18 | 1 | -2/+4 | |
| |/ | ||||||
| * | no longer trust custom repr for int/long/float subclasses #118v3.7.0 | Bob Ippolito | 2015-05-18 | 8 | -8/+101 | |
| | | ||||||
| * | Merge pull request #116 from d0ugal/patch-1 | Bob Ippolito | 2015-02-18 | 1 | -1/+1 | |
| |\ | | | | | | | Fixed a typo in the docs | |||||
| | * | Fixed a typo in the docs | Dougal Matthews | 2015-02-18 | 1 | -1/+1 | |
| |/ | ||||||
| * | update CHANGES and bump version to v3.6.5v3.6.5 | Bob Ippolito | 2014-10-24 | 4 | -3/+9 | |
| | | ||||||
| * | Merge pull request #110 from kbussell/memoryleak | Bob Ippolito | 2014-10-24 | 1 | -0/+1 | |
| |\ | | | | | | | Fix memory leak when an error occurs encoding dict items, fixes #109 | |||||
| | * | Fix memory leak when an error occurs encoding dict items | Keith Bussell | 2014-10-23 | 1 | -0/+1 | |
| |/ | ||||||
| * | Merge pull request #107 from simplejson/sort_keys_dump-106v3.6.4 | Bob Ippolito | 2014-09-29 | 5 | -8/+26 | |
| |\ | | | | | | | Fix dump's implementation of sort_keys | |||||
| | * | failing test for #106 | Bob Ippolito | 2014-09-29 | 1 | -0/+9 | |
| | | | ||||||
| | * | update version for v3.6.4 | Bob Ippolito | 2014-09-29 | 4 | -3/+8 | |
| | | | ||||||
| | * | ensure cached encoder is only used when all settings are defaultsort_keys_dump-106 | Bob Ippolito | 2014-09-24 | 1 | -5/+9 | |
| |/ | ||||||
| * | documentation about key limitations in JSON per #103v3.6.3 | Bob Ippolito | 2014-08-18 | 5 | -6/+20 | |
| | | ||||||
| * | doc updates from http://bugs.python.org/issue21514 re: #102v3.6.2 | Bob Ippolito | 2014-08-09 | 5 | -19/+84 | |
| | | ||||||
| * | Merge branch 'docs-102'v3.6.1 | Bob Ippolito | 2014-08-09 | 5 | -42/+224 | |
| |\ | ||||||
| | * | update documentation per #102docs-102 | Bob Ippolito | 2014-08-09 | 5 | -42/+224 | |
| |/ | ||||||
| * | forgot how to reST apparently | Bob Ippolito | 2014-07-22 | 1 | -2/+2 | |
| | | ||||||
| * | make note of the python2.2 branch | Bob Ippolito | 2014-07-22 | 1 | -0/+6 | |
| | | ||||||
| * | v3.6.0v3.6.0 | Bob Ippolito | 2014-07-21 | 1 | -1/+1 | |
| | | ||||||
| * | Merge branch 'sporty-master' | Bob Ippolito | 2014-07-21 | 5 | -4/+25 | |
| |\ | ||||||
| | * | generalize BOM stripping to any use of raw_decode | Bob Ippolito | 2014-07-21 | 6 | -24/+24 | |
| | | | ||||||
| | * | strip utf-8 bom. | Ryo Takahashi | 2014-07-21 | 3 | -1/+22 | |
| |/ | ||||||
| * | Fix lower bound checking in scan_once / raw_decode API #98v3.5.3 | Bob Ippolito | 2014-06-24 | 8 | -5/+30 | |
| | | ||||||
| * | update version for v3.5.2v3.5.2 | Bob Ippolito | 2014-05-23 | 4 | -3/+8 | |
| | | ||||||
| * | Merge pull request #97 from mindw/vs2008_build_fx | Bob Ippolito | 2014-05-23 | 1 | -1/+1 | |
| |\ | | | | | | | fix build for VS 2008 | |||||
| | * | fix build for VS 2008 | Gabi Davar | 2014-05-23 | 1 | -1/+1 | |
| |/ | ||||||
| * | consistently reject int_as_string_bitcount <= 0 #96v3.5.1 | Bob Ippolito | 2014-05-22 | 7 | -4/+18 | |
| | | ||||||
| * | detabv3.5.0 | Bob Ippolito | 2014-05-21 | 1 | -101/+101 | |
| | | ||||||
| * | clean up #96 and prep for v3.5.0 release | Bob Ippolito | 2014-05-21 | 7 | -33/+53 | |
| | | ||||||
| * | Merge pull request #96 from coldeasy/int_as_string_bitcount | Bob Ippolito | 2014-05-20 | 6 | -118/+282 | |
| |\ | | | | | | | Adding `int_as_string_bitcount` option | |||||
| | * | Allocate int_as_string bounds once per encoder | Colin Deasy | 2014-05-20 | 2 | -32/+38 | |
| | | | ||||||
| | * | Adding `int_as_string_bitcount` option | Colin Deasy | 2014-05-14 | 6 | -104/+262 | |
| | | | ||||||
| * | | fix arg check for item_sort_key | Bob Ippolito | 2014-05-20 | 1 | -1/+3 | |
| |/ | ||||||
| * | Merge pull request #95 from DanielBaird/patch-1 | Bob Ippolito | 2014-05-06 | 1 | -2/+0 | |
| |\ | | | | | | | doc update: cleaned up double-paste in separators description. | |||||
| | * | cleaned up double-paste in separators description. | Daniel Baird | 2014-05-07 | 1 | -2/+0 | |
| |/ | ||||||
| * | fix tests to run on Python 3.4 | Bob Ippolito | 2014-04-30 | 5 | -40/+52 | |
| | | ||||||
| * | Merge pull request #94 from hugovk/patch-1 | Bob Ippolito | 2014-04-30 | 1 | -0/+1 | |
| |\ | | | | | | | Travis CI now has Python 3.4 | |||||
| | * | Travis CI now has Python 3.4 | Hugo | 2014-04-30 | 1 | -0/+1 | |
| |/ | | | | | http://blog.travis-ci.com/2014-04-28-upcoming-build-environment-updates/ | |||||
| * | bump to v3.4.0v3.4.0 | Bob Ippolito | 2014-04-02 | 4 | -9/+9 | |
| | | ||||||
| * | Merge pull request #92 from Infinidat/master | Bob Ippolito | 2014-04-02 | 1 | -1/+4 | |
| |\ | | | | | | | bringing back setuptools (bdist_egg build support), but only if already present | |||||
| | * | bringing back bdist_egg build support | Guy Rozendorn | 2014-04-02 | 1 | -1/+4 | |
| |/ |