summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #107 from simplejson/sort_keys_dump-106v3.6.4Bob Ippolito2014-09-295-8/+26
|\
| * failing test for #106Bob Ippolito2014-09-291-0/+9
| * update version for v3.6.4Bob Ippolito2014-09-294-3/+8
| * 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-185-6/+20
* doc updates from http://bugs.python.org/issue21514 re: #102v3.6.2Bob Ippolito2014-08-095-19/+84
* Merge branch 'docs-102'v3.6.1Bob Ippolito2014-08-095-42/+224
|\
| * update documentation per #102docs-102Bob Ippolito2014-08-095-42/+224
|/
* forgot how to reST apparentlyBob Ippolito2014-07-221-2/+2
* make note of the python2.2 branchBob Ippolito2014-07-221-0/+6
* v3.6.0v3.6.0Bob Ippolito2014-07-211-1/+1
* Merge branch 'sporty-master'Bob Ippolito2014-07-215-4/+25
|\
| * generalize BOM stripping to any use of raw_decodeBob Ippolito2014-07-216-24/+24
| * 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-248-5/+30
* update version for v3.5.2v3.5.2Bob Ippolito2014-05-234-3/+8
* Merge pull request #97 from mindw/vs2008_build_fxBob 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-227-4/+18
* detabv3.5.0Bob Ippolito2014-05-211-101/+101
* clean up #96 and prep for v3.5.0 releaseBob Ippolito2014-05-217-33/+53
* Merge pull request #96 from coldeasy/int_as_string_bitcountBob Ippolito2014-05-206-118/+282
|\
| * Allocate int_as_string bounds once per encoderColin Deasy2014-05-202-32/+38
| * Adding `int_as_string_bitcount` optionColin Deasy2014-05-146-104/+262
* | fix arg check for item_sort_keyBob Ippolito2014-05-201-1/+3
|/
* Merge pull request #95 from DanielBaird/patch-1Bob Ippolito2014-05-061-2/+0
|\
| * cleaned up double-paste in separators description.Daniel Baird2014-05-071-2/+0
|/
* fix tests to run on Python 3.4Bob Ippolito2014-04-305-40/+52
* Merge pull request #94 from hugovk/patch-1Bob Ippolito2014-04-301-0/+1
|\
| * Travis CI now has Python 3.4Hugo2014-04-301-0/+1
|/
* bump to v3.4.0v3.4.0Bob Ippolito2014-04-024-9/+9
* Merge pull request #92 from Infinidat/masterBob Ippolito2014-04-021-1/+4
|\
| * bringing back bdist_egg build supportGuy Rozendorn2014-04-021-1/+4
|/
* improve Python 3.3 compat #87, bump to 3.3.3v3.3.3Bob Ippolito2014-02-146-8/+16
* add comment about setuptools usage #85Bob Ippolito2014-02-101-0/+5
* travis no longer supports python2.5Bob Ippolito2014-01-061-1/+0
* update CHANGES.txt for v3.3.2v3.3.2Bob Ippolito2014-01-064-4/+9
* Merge pull request #82 from JuhaS/patch-1Bob Ippolito2013-10-311-1/+1
|\
| * Documentation fix for decoded string typesJuhaS2013-10-311-1/+1
|/
* update metadata for 3.3.1v3.3.1Bob Ippolito2013-10-054-3/+8
* Merge pull request #78 from idank/masterBob Ippolito2013-10-052-1/+20
|\
| * fix pickle breakage with JSONDecodeErrorIdan Kamara2013-10-052-1/+20
|/
* pass-through in decoder for lone surrogates #62v3.3.0surrogate-62baserock/morphBob Ippolito2013-05-078-101/+123
* update release datev3.2.0Bob Ippolito2013-05-011-1/+1
* ignore_nan #63ecma-262-63Bob Ippolito2013-05-017-47/+112
* update CHANGES and testsfor_json-69Bob Ippolito2013-05-013-75/+53
* make argument order for c_make_encoder match make_iterencodeBob Ippolito2013-05-012-4/+4
* Version bump to 3.2.0 for the hell of it.shakefu2013-04-201-1/+1
* Implement for_json kwarg; pure Python version; add tests; update documentation.shakefu2013-04-175-39/+210
* Initial stab at for_json hook for C extension.shakefu2013-04-171-0/+27