| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| * | Merge #16057: Clarify why the base method default is called in custom encoders. | R David Murray | 2013-03-18 | 1 | -0/+1 |
| |\ |
|
| | * | Merge #16057: Clarify why the base method default is called in custom encoders. | R David Murray | 2013-03-18 | 1 | -0/+1 |
| | |\ |
|
| | | * | #16057: Clarify why the base method default is called in custom encoders. | R David Murray | 2013-03-18 | 1 | -0/+1 |
|
|
| * | | | #17368: merge with 3.3. | Ezio Melotti | 2013-03-12 | 1 | -1/+1 |
| |\ \ \
| |/ / |
|
| | * | | #17368: merge with 3.2. | Ezio Melotti | 2013-03-12 | 1 | -1/+1 |
| | |\ \
| | |/ |
|
| | | * | #17368: Fix an off-by-one error in the Python JSON decoder that caused a fail... | Ezio Melotti | 2013-03-12 | 1 | -1/+1 |
|
|
| * | | | Issue #17225: JSON decoder now counts columns in the first line starting | Serhiy Storchaka | 2013-02-21 | 3 | -3/+3 |
| |\ \ \
| |/ / |
|
| | * | | Issue #17225: JSON decoder now counts columns in the first line starting | Serhiy Storchaka | 2013-02-21 | 3 | -3/+3 |
| | |\ \
| | |/ |
|
| | | * | Issue #17225: JSON decoder now counts columns in the first line starting | Serhiy Storchaka | 2013-02-21 | 3 | -3/+3 |
|
|
| | * | | #16476: merge with 3.2. | Ezio Melotti | 2012-11-29 | 1 | -1/+2 |
| | |\ \
| | |/ |
|
| | | * | #16476: Fix json.tool to avoid including trailing whitespace. | Ezio Melotti | 2012-11-29 | 1 | -1/+2 |
|
|
| * | | | #16009: JSON error messages now provide more information. Patch by Serhiy St... | Ezio Melotti | 2013-01-03 | 2 | -9/+9 |
|
|
| * | | | #16549: merge with 3.3. | Ezio Melotti | 2012-11-29 | 1 | -9/+11 |
| |\ \ \
| |/ / |
|
| | * | | #16549: merge with 3.2. | Ezio Melotti | 2012-11-29 | 1 | -9/+11 |
| | |\ \
| | |/ |
|
| | | * | #16549: Make json.tool work again on Python 3 and add tests. Initial patch b... | Ezio Melotti | 2012-11-29 | 1 | -9/+11 |
|
|
| | * | | #16333: merge with 3.2. | Ezio Melotti | 2012-11-28 | 2 | -5/+12 |
| | |\ \
| | |/ |
|
| | | * | #16333: document a way to get rid of trailing whitespace when indent is used. | Ezio Melotti | 2012-11-28 | 2 | -5/+12 |
|
|
| * | | | Cleanup json decoder: float() has builtin support of nan, +inf, -inf since Py... | Victor Stinner | 2012-11-28 | 1 | -11/+3 |
|
|
| * | | | #16333: fix example in docstring. | Ezio Melotti | 2012-11-28 | 1 | -2/+1 |
|
|
| * | | | #16333: use (",", ": ") as default separator when indent is specified to avoi... | Ezio Melotti | 2012-11-28 | 2 | -9/+14 |
|
|
| * | | | Merge issue #14570: Document json sort_keys parameter properly. | Andrew Svetlov | 2012-10-28 | 1 | -6/+12 |
| |\ \ \
| |/ / |
|
| | * | | Merge issue #14570: Document json sort_keys parameter properly. | Andrew Svetlov | 2012-10-28 | 1 | -6/+12 |
| | |\ \
| | |/ |
|
| | | * | Issue #14570: Document json sort_keys parameter properly. | Andrew Svetlov | 2012-10-28 | 1 | -6/+12 |
|
|
| * | | | more yield from | Philip Jenvey | 2012-10-01 | 1 | -10/+5 |
| |/ / |
|
| * | | Issue #5067: improve some json error messages. | Antoine Pitrou | 2012-06-28 | 3 | -7/+9 |
| |\ \
| |/ |
|
| | * | Issue #5067: improve some json error messages. | Antoine Pitrou | 2012-06-28 | 3 | -7/+9 |
|
|
| * | | #14875: merge with 3.2. | Ezio Melotti | 2012-05-21 | 1 | -2/+1 |
| |\ \
| |/ |
|
| | * | #14875: Use float('inf') instead of float('1e66666') in the json module. | Ezio Melotti | 2012-05-21 | 1 | -2/+1 |
|
|
| * | | Merge 3.2: Issue #13703 plus some related test suite fixes. | Georg Brandl | 2012-02-20 | 1 | -1/+3 |
| |\ \
| |/ |
|
| | * | Merge from 3.1: Issue #13703: add a way to randomize the hash values of basic... | Georg Brandl | 2012-02-20 | 1 | -1/+3 |
| | |\ |
|
| | | * | Issue #13703: add a way to randomize the hash values of basic types (str, byt... | Georg Brandl | 2012-02-20 | 1 | -1/+3 |
|
|
| | | * | #5723: Improve json tests to be executed with and without accelerations. | Ezio Melotti | 2011-05-14 | 17 | -193/+245 |
|
|
| | | * | #12051: Fix segfault in json.dumps() while encoding highly-nested objects usi... | Ezio Melotti | 2011-05-10 | 1 | -1/+20 |
|
|
| | | * | #12017: Fix segfault in json.loads() while decoding highly-nested objects usi... | Ezio Melotti | 2011-05-07 | 1 | -0/+12 |
|
|
| * | | | Implement PEP 393. | Martin v. Löwis | 2011-09-28 | 1 | -2/+1 |
| |/ / |
|
| * | | #5723: merge with 3.1. | Ezio Melotti | 2011-05-14 | 1 | -2/+2 |
|
|
| * | | Merge 3.1 | Éric Araujo | 2011-04-24 | 1 | -1/+1 |
| |\ \
| |/ |
|
| | * | Add a space to make json doc a bit more readable | Éric Araujo | 2011-04-21 | 1 | -1/+1 |
|
|
| * | | Merge with 3.1. | Ezio Melotti | 2011-04-13 | 1 | -0/+6 |
| |\ \
| |/ |
|
| | * | #9233: Fix json.loads({}) to return a dict (instead of a list), when _json is... | Ezio Melotti | 2011-04-13 | 2 | -0/+11 |
|
|
| | * | Remove unnecessary imports and use assertIs instead of assertTrue. | Ezio Melotti | 2011-04-13 | 2 | -5/+3 |
|
|
| | * | #9233: Fix json to work properly even when _json is not available. | Ezio Melotti | 2011-04-13 | 2 | -1/+2 |
|
|
| | * | #9233: skip _json-specific tests when _json is not available. | Ezio Melotti | 2011-04-13 | 2 | -2/+14 |
|
|
| * | | Merge #10019: Fix regression relative to 2.6: add newlines if indent=0 | R David Murray | 2011-04-13 | 1 | -1/+1 |
| |\ \
| |/ |
|
| | * | #10019: Fix regression relative to 2.6: add newlines if indent=0 | R David Murray | 2011-04-13 | 2 | -1/+17 |
|
|
| | * | Merged revisions 88137 via svnmerge from | Antoine Pitrou | 2011-01-21 | 1 | -0/+2 |
|
|
| | * | Merged revisions 85530,85532-85534,85538-85543,85546-85548 via svnmerge from | Georg Brandl | 2010-11-26 | 2 | -4/+34 |
|
|
| | * | Merged revisions 86596 via svnmerge from | Ezio Melotti | 2010-11-21 | 14 | -59/+59 |
|
|
| | * | Merged revisions 82805-82806,83523-83527,83536,83538,83542,83546-83548,83550-... | Georg Brandl | 2010-10-06 | 3 | -23/+21 |
|
|
| | * | Merged revisions 83212,83829,83833,83838-83839,83878,84019,84025,84028,84032,... | Florent Xicluna | 2010-08-14 | 1 | -1/+1 |
|
|
