summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Revert "Merge pull request #46 from cgohlke/patch-1""Bob Ippolito2013-01-011-3/+6
| | | | This reverts commit 4d6b86059c981d1a275c803ecc91f511980b0af0.
* explicitly build the extensionBob Ippolito2013-01-011-1/+3
|
* Revert "Merge pull request #46 from cgohlke/patch-1"Bob Ippolito2013-01-011-6/+3
| | | | | This reverts commit 1aa8819498321dbfc601ff8a304d0c8a901f76da, reversing changes made to ed84084a51367a4731f80794b062f54365ac9c59.
* Merge pull request #46 from cgohlke/patch-1Bob Ippolito2013-01-011-3/+6
|\ | | | | Fixes for Visual C compilers
| * Fixes for Visual C compilersChristoph Gohlke2013-01-011-3/+6
|/
* bump to 3.0.2, fix Py_EnterRecusiveCall/Py_LeaveRecursiveCall balance from 3.0.1v3.0.2Bob Ippolito2013-01-015-7/+20
|
* _Py_Accu style encoder optimization, bump to 3.0.1v3.0.1Bob Ippolito2013-01-016-39/+171
|
* Merge branch 'py3'v3.0.0Bob Ippolito2012-12-3025-524/+1181
|\
| * add date for v3.0.0py3Bob Ippolito2012-12-301-1/+1
| |
| * more coverageBob Ippolito2012-12-301-0/+25
| |
| * better test coverage for invalid surrogatesBob Ippolito2012-12-302-10/+60
| |
| * more coverage for skipkeysBob Ippolito2012-12-301-4/+23
| |
| * clean up skipkeys/stringification in C APIBob Ippolito2012-12-302-86/+106
| |
| * more coverage, decimal key coercionBob Ippolito2012-12-296-10/+55
| |
| * try and use native Py3.3 unicode everywhereBob Ippolito2012-12-293-110/+182
| |
| * fix some style nitsBob Ippolito2012-12-281-3/+6
| |
| * start working on improving coverage, remove unused bytes code paths from py3Bob Ippolito2012-12-285-24/+78
| |
| * add some more classifiers for pypiBob Ippolito2012-12-281-0/+9
| |
| * fix python 2.5 test regressionBob Ippolito2012-12-281-1/+2
| |
| * First pass at Python 3.3 compatibilityBob Ippolito2012-12-2824-364/+723
|/ | | | First pass at Python 3.3 compatibility, bump to 3.0.0
* export JSONEncoderForHTML (#41), bump to v2.6.2v2.6.2Bob Ippolito2012-09-215-9/+12
|
* bump version to 2.6.1 and add test/docs for #38 raw_decode fixv2.6.1Bob Ippolito2012-07-276-7/+18
|
* Merge pull request #38 from japeq/masterBob Ippolito2012-07-271-3/+5
|\ | | | | Bug fixes related to raw_decode()
| * raw_decode(): Skip whitespace before the objectJanne Kulmala2012-07-191-3/+3
| |
| * raw_decode(): Document 'idx' parameterJanne Kulmala2012-07-191-0/+2
|/
* Error messages changed to match proposal for Python 3.3.1Bob Ippolito2012-06-267-22/+37
|
* Fix for regression introduced in 2.5.1v2.5.2Bob Ippolito2012-05-105-4/+9
|
* Support for use_decimal=True in sub-interpretersv2.5.1Bob Ippolito2012-05-107-22/+40
|
* Merge branch 'item_sort_key'v2.5.0Bob Ippolito2012-03-298-37/+153
|\
| * fix typoitem_sort_keyBob Ippolito2012-03-291-2/+2
| |
| * bump version to 2.5.0, add docs for item_sort_keyBob Ippolito2012-03-298-36/+91
| |
| * Merge remote-tracking branch 'scottkmaxwell/master' into item_sort_keyBob Ippolito2012-03-294-16/+77
| |\ |/ /
| * Added item_sort_keyScott Maxwell2012-03-204-16/+77
|/ | | | Allows sorting by aspects of the key/value pair.
* oops, fix release dateBob Ippolito2012-03-061-1/+1
|
* Merge branch 'bigint_as_string-gh31'v2.4.0Bob Ippolito2012-03-068-21/+155
|\
| * Merge remote-tracking branch 'scottkmaxwell/master' into bigint_as_string-gh31bigint_as_string-gh31Bob Ippolito2012-03-061-2/+2
| |\
| | * Change 1 to 1LL to fix warningsScott Maxwell2012-03-061-2/+2
| |/ | | | | | | Compilers complained about shifting 1 53 times since that exceeded the size.
| * version and changelog bumpBob Ippolito2012-03-064-4/+10
| |
| * fix edge cases and pre-2.7 compatibilityBob Ippolito2012-03-064-49/+108
| |
| * Merge remote-tracking branch 'scottkmaxwell/master' into bigint_as_string-gh31Bob Ippolito2012-03-065-16/+85
| |\ |/ /
| * Integrated unit test into test suiteScott Maxwell2012-03-022-18/+1
| | | | | | | | Had to add it to __init__.py and remove my manual no-speedups tests.
| * Finalized bigint_as_string featureScott Maxwell2012-03-024-30/+79
| | | | | | | | | | | | | | Renamed javascript_safe_ints to bigint_as_string to match the similar parameter in PHP. Added unit tests. Fixed boundary of the bigint range. Added bigint_as_string to default encoder test.
| * Changed limits from 2^54 to 2^53Scott Maxwell2012-03-013-11/+11
| |
| * Added javascript_safe_ints supportScott Maxwell2012-03-013-14/+51
|/ | | | Javascript cannot display integers of 2^54 or higher without loss of precision. This option will put numbers of 2^54 and higher or -2^54 and lower into quotes.
* bump to 2.3.3 and clean up indent codev2.3.3Bob Ippolito2012-02-275-10/+13
|
* Merge pull request #29 from kini/indent-eafpBob Ippolito2012-02-272-3/+45
|\ | | | | Allow unknown numerical types for indent parameter
| * Documentation and a test for the previous commitKeshav Kini2012-02-282-2/+42
| |
| * Allow unknown numerical types for indent parameterKeshav Kini2012-02-251-1/+3
| | | | | | | | | | | | | | | | This was causing failures in software which passes objects which are neither of type str, int, or long, but rather a custom numerical class, as the value of the indent parameter. Since this custom numerical class understands multiplication by strings, it should be accepted by simplejson's encoder and treated as a numerical argument.
* | attempt to support travisBob Ippolito2012-02-271-0/+5
|/
* fix 2.3.1 regression and bump version to 2.3.2v2.3.2Bob Ippolito2011-12-305-5/+9
|