Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | |||||
* | bump version in setup.pyv2.3.1 | Bob Ippolito | 2011-12-29 | 1 | -1/+1 |
| | |||||
* | Merge branch 'dict-subclass-gh26' | Bob Ippolito | 2011-12-29 | 6 | -46/+96 |
|\ | |||||
| * | callable check for _asdict with namedtuple_as_objectdict-subclass-gh26 | Bob Ippolito | 2011-12-29 | 6 | -42/+92 |
| | | |||||
| * | fix whitespace | Bob Ippolito | 2011-12-29 | 1 | -4/+4 |
|/ | |||||
* | Merge branch 'namedtuple_duck-gh22'v2.3.0 | Bob Ippolito | 2011-12-05 | 8 | -19/+50 |
|\ | |||||
| * | Change release date for 2.3.0namedtuple_duck-gh22 | Bob Ippolito | 2011-12-05 | 1 | -1/+1 |
| | | |||||
| * | test with DucKValue and DuckPoint which are not tuple subclasses | Bob Ippolito | 2011-11-18 | 1 | -4/+24 |
| | | |||||
| * | bump version to 2.3.0 | Bob Ippolito | 2011-11-18 | 4 | -4/+10 |
| | | |||||
| * | update docs | Bob Ippolito | 2011-11-18 | 1 | -3/+11 |
| | | |||||
| * | Merge remote-tracking branch 'singingwolfboy/master' into namedtuple_duck-gh22 | Bob Ippolito | 2011-11-18 | 2 | -8/+5 |
| |\ |/ / | |||||
| * | Removed PyTuple_Check from _is_namedtuple() in _speedups.c | David Baumgold | 2011-11-10 | 1 | -1/+1 |
| | | |||||
| * | Removed isinstance() check for namedtuple_as_object | David Baumgold | 2011-11-10 | 1 | -7/+4 |
|/ | | | | | | | | Using isinstance() is not Pythonic and should be avoided when possible. By using duck-typing instead, we can easily support other objects that do not inherit from tuple but still support the same API as namedtuple, such as objects created using the `recordtype` library: http://pypi.python.org/pypi/recordtype | ||||
* | fix https://github.com/simplejson/simplejson/issues/16 - include MANIFEST.in ↵v2.2.1 | Bob Ippolito | 2011-09-06 | 5 | -3/+9 |
| | | | | in MANIFEST.in. distutils is dumb. | ||||
* | I knew I missed something. Fix the date in CHANGES.txt | Bob Ippolito | 2011-09-04 | 1 | -1/+1 |
| | |||||
* | Merge branch 'pure-distutils'v2.2.0 | Bob Ippolito | 2011-09-04 | 8 | -312/+39 |
|\ | |||||
| * | fix tests for py2.5pure-distutils | Bob Ippolito | 2011-09-04 | 1 | -0/+6 |
| | | |||||
| * | remove setuptools | Bob Ippolito | 2011-09-04 | 6 | -309/+33 |
| | | |||||
| * | setup.cfg is unused | Bob Ippolito | 2011-09-04 | 1 | -3/+0 |
|/ | |||||
* | Merge branch 'namedtuple-object-gh6' | Bob Ippolito | 2011-09-04 | 11 | -42/+279 |
|\ | |||||
| * | 2.2.0 - namedtuple_as_object and tuple_as_array options, use_decimal now ↵namedtuple-object-gh6 | Bob Ippolito | 2011-09-04 | 11 | -39/+270 |
| | | | | | | | | True on encoding | ||||
| * | update docs with namedtuple encoding to JSON object | Bob Ippolito | 2011-09-03 | 3 | -3/+9 |
|/ | |||||
* | Merge branch 'scan-ValueError-gh15' | Bob Ippolito | 2011-09-03 | 4 | -2/+26 |
|\ | |||||
| * | also test unicode and fix the JSONDecodeError issuescan-ValueError-gh15 | Bob Ippolito | 2011-09-03 | 3 | -10/+20 |
| | | |||||
| * | ignore coverage files | Bob Ippolito | 2011-09-03 | 1 | -0/+2 |
| | | |||||
| * | test case for https://github.com/simplejson/simplejson/issues/15 | Bob Ippolito | 2011-09-03 | 1 | -0/+12 |
|/ | |||||
* | document JSONDecodeError https://github.com/simplejson/simplejson/issues/12 | Bob Ippolito | 2011-06-22 | 2 | -5/+52 |
| | |||||
* | Force unicode linebreak characters to be escaped (U+2028 and U+2029) | Bob Ippolito | 2011-05-15 | 3 | -1/+15 |
| | |||||
* | Move docs to http://simplejson.readthedocs.org/ and update version to 2.1.7 | Bob Ippolito | 2011-05-08 | 8 | -13/+10 |
| | |||||
* | update docsv2.1.6 | Bob Ippolito | 2011-05-08 | 1 | -5/+5 |
| | |||||
* | add a release date | Bob Ippolito | 2011-05-08 | 1 | -1/+1 |
| |