Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Revert "Revert "Merge pull request #46 from cgohlke/patch-1"" | Bob Ippolito | 2013-01-01 | 1 | -3/+6 |
| | | | | This reverts commit 4d6b86059c981d1a275c803ecc91f511980b0af0. | ||||
* | explicitly build the extension | Bob Ippolito | 2013-01-01 | 1 | -1/+3 |
| | |||||
* | Revert "Merge pull request #46 from cgohlke/patch-1" | Bob Ippolito | 2013-01-01 | 1 | -6/+3 |
| | | | | | This reverts commit 1aa8819498321dbfc601ff8a304d0c8a901f76da, reversing changes made to ed84084a51367a4731f80794b062f54365ac9c59. | ||||
* | Merge pull request #46 from cgohlke/patch-1 | Bob Ippolito | 2013-01-01 | 1 | -3/+6 |
|\ | | | | | Fixes for Visual C compilers | ||||
| * | Fixes for Visual C compilers | Christoph Gohlke | 2013-01-01 | 1 | -3/+6 |
|/ | |||||
* | bump to 3.0.2, fix Py_EnterRecusiveCall/Py_LeaveRecursiveCall balance from 3.0.1v3.0.2 | Bob Ippolito | 2013-01-01 | 5 | -7/+20 |
| | |||||
* | _Py_Accu style encoder optimization, bump to 3.0.1v3.0.1 | Bob Ippolito | 2013-01-01 | 6 | -39/+171 |
| | |||||
* | Merge branch 'py3'v3.0.0 | Bob Ippolito | 2012-12-30 | 25 | -524/+1181 |
|\ | |||||
| * | add date for v3.0.0py3 | Bob Ippolito | 2012-12-30 | 1 | -1/+1 |
| | | |||||
| * | more coverage | Bob Ippolito | 2012-12-30 | 1 | -0/+25 |
| | | |||||
| * | better test coverage for invalid surrogates | Bob Ippolito | 2012-12-30 | 2 | -10/+60 |
| | | |||||
| * | more coverage for skipkeys | Bob Ippolito | 2012-12-30 | 1 | -4/+23 |
| | | |||||
| * | clean up skipkeys/stringification in C API | Bob Ippolito | 2012-12-30 | 2 | -86/+106 |
| | | |||||
| * | more coverage, decimal key coercion | Bob Ippolito | 2012-12-29 | 6 | -10/+55 |
| | | |||||
| * | try and use native Py3.3 unicode everywhere | Bob Ippolito | 2012-12-29 | 3 | -110/+182 |
| | | |||||
| * | fix some style nits | Bob Ippolito | 2012-12-28 | 1 | -3/+6 |
| | | |||||
| * | start working on improving coverage, remove unused bytes code paths from py3 | Bob Ippolito | 2012-12-28 | 5 | -24/+78 |
| | | |||||
| * | add some more classifiers for pypi | Bob Ippolito | 2012-12-28 | 1 | -0/+9 |
| | | |||||
| * | fix python 2.5 test regression | Bob Ippolito | 2012-12-28 | 1 | -1/+2 |
| | | |||||
| * | First pass at Python 3.3 compatibility | Bob Ippolito | 2012-12-28 | 24 | -364/+723 |
|/ | | | | First pass at Python 3.3 compatibility, bump to 3.0.0 | ||||
* | export JSONEncoderForHTML (#41), bump to v2.6.2v2.6.2 | Bob Ippolito | 2012-09-21 | 5 | -9/+12 |
| | |||||
* | bump version to 2.6.1 and add test/docs for #38 raw_decode fixv2.6.1 | Bob Ippolito | 2012-07-27 | 6 | -7/+18 |
| | |||||
* | Merge pull request #38 from japeq/master | Bob Ippolito | 2012-07-27 | 1 | -3/+5 |
|\ | | | | | Bug fixes related to raw_decode() | ||||
| * | raw_decode(): Skip whitespace before the object | Janne Kulmala | 2012-07-19 | 1 | -3/+3 |
| | | |||||
| * | raw_decode(): Document 'idx' parameter | Janne Kulmala | 2012-07-19 | 1 | -0/+2 |
|/ | |||||
* | Error messages changed to match proposal for Python 3.3.1 | Bob Ippolito | 2012-06-26 | 7 | -22/+37 |
| | |||||
* | Fix for regression introduced in 2.5.1v2.5.2 | Bob Ippolito | 2012-05-10 | 5 | -4/+9 |
| | |||||
* | Support for use_decimal=True in sub-interpretersv2.5.1 | Bob Ippolito | 2012-05-10 | 7 | -22/+40 |
| | |||||
* | Merge branch 'item_sort_key'v2.5.0 | Bob Ippolito | 2012-03-29 | 8 | -37/+153 |
|\ | |||||
| * | fix typoitem_sort_key | Bob Ippolito | 2012-03-29 | 1 | -2/+2 |
| | | |||||
| * | bump version to 2.5.0, add docs for item_sort_key | Bob Ippolito | 2012-03-29 | 8 | -36/+91 |
| | | |||||
| * | Merge remote-tracking branch 'scottkmaxwell/master' into item_sort_key | Bob Ippolito | 2012-03-29 | 4 | -16/+77 |
| |\ |/ / | |||||
| * | Added item_sort_key | Scott Maxwell | 2012-03-20 | 4 | -16/+77 |
|/ | | | | Allows sorting by aspects of the key/value pair. | ||||
* | oops, fix release date | Bob Ippolito | 2012-03-06 | 1 | -1/+1 |
| | |||||
* | Merge branch 'bigint_as_string-gh31'v2.4.0 | Bob Ippolito | 2012-03-06 | 8 | -21/+155 |
|\ | |||||
| * | Merge remote-tracking branch 'scottkmaxwell/master' into bigint_as_string-gh31bigint_as_string-gh31 | Bob Ippolito | 2012-03-06 | 1 | -2/+2 |
| |\ | |||||
| | * | Change 1 to 1LL to fix warnings | Scott Maxwell | 2012-03-06 | 1 | -2/+2 |
| |/ | | | | | | | Compilers complained about shifting 1 53 times since that exceeded the size. | ||||
| * | version and changelog bump | Bob Ippolito | 2012-03-06 | 4 | -4/+10 |
| | | |||||
| * | fix edge cases and pre-2.7 compatibility | Bob Ippolito | 2012-03-06 | 4 | -49/+108 |
| | | |||||
| * | Merge remote-tracking branch 'scottkmaxwell/master' into bigint_as_string-gh31 | Bob Ippolito | 2012-03-06 | 5 | -16/+85 |
| |\ |/ / | |||||
| * | Integrated unit test into test suite | Scott Maxwell | 2012-03-02 | 2 | -18/+1 |
| | | | | | | | | Had to add it to __init__.py and remove my manual no-speedups tests. | ||||
| * | Finalized bigint_as_string feature | Scott Maxwell | 2012-03-02 | 4 | -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^53 | Scott Maxwell | 2012-03-01 | 3 | -11/+11 |
| | | |||||
| * | Added javascript_safe_ints support | Scott Maxwell | 2012-03-01 | 3 | -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.3 | Bob Ippolito | 2012-02-27 | 5 | -10/+13 |
| | |||||
* | Merge pull request #29 from kini/indent-eafp | Bob Ippolito | 2012-02-27 | 2 | -3/+45 |
|\ | | | | | Allow unknown numerical types for indent parameter | ||||
| * | Documentation and a test for the previous commit | Keshav Kini | 2012-02-28 | 2 | -2/+42 |
| | | |||||
| * | Allow unknown numerical types for indent parameter | Keshav Kini | 2012-02-25 | 1 | -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 travis | Bob Ippolito | 2012-02-27 | 1 | -0/+5 |
|/ | |||||
* | fix 2.3.1 regression and bump version to 2.3.2v2.3.2 | Bob Ippolito | 2011-12-30 | 5 | -5/+9 |
| |