Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Closes #25910: fix dead and permanently redirected links in the docs. Thanks ↵ | Georg Brandl | 2016-02-26 | 1 | -1/+1 |
| | | | | to SilentGhost for the patch. | ||||
* | Issue #25161: Merge full stops from 3.4 into 3.5 | Martin Panter | 2015-10-10 | 1 | -1/+1 |
|\ | |||||
| * | Issue #25161: Add full stops in documentation; patch by Takase Arihiro | Martin Panter | 2015-10-10 | 1 | -1/+1 |
| | | |||||
* | | Issue #19361: JSON decoder now raises JSONDecodeError instead of ValueError. | Serhiy Storchaka | 2015-01-26 | 1 | -3/+36 |
| | | |||||
* | | Issue #23181: More "codepoint" -> "code point". | Serhiy Storchaka | 2015-01-18 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Issue #23181: More "codepoint" -> "code point". | Serhiy Storchaka | 2015-01-18 | 1 | -1/+1 |
| | | |||||
* | | Issue #21514: The documentation of the json module now refers to new JSON RFC | Serhiy Storchaka | 2014-11-27 | 1 | -39/+72 |
|\ \ | |/ | | | | | 7159 instead of obsoleted RFC 4627. | ||||
| * | Issue #21514: The documentation of the json module now refers to new JSON RFC | Serhiy Storchaka | 2014-11-27 | 1 | -39/+72 |
| | | | | | | | | 7159 instead of obsoleted RFC 4627. | ||||
* | | Issue #21650: Add an `--sort-keys` option to json.tool CLI. | Berker Peksag | 2014-11-10 | 1 | -0/+11 |
| | | |||||
* | | merge with 3.4 | Georg Brandl | 2014-10-28 | 1 | -2/+2 |
|\ \ | |/ | |||||
| * | Using "-m module" is easier to read and understand than "-mmodule". | Georg Brandl | 2014-10-28 | 1 | -2/+2 |
| | | |||||
* | | merge with 3.4 | Georg Brandl | 2014-09-20 | 1 | -1/+1 |
|\ \ | |/ | |||||
* | | correct sphinx mark up for cmdline options (closes #21210) | Benjamin Peterson | 2014-04-13 | 1 | -2/+4 |
| | | |||||
* | | improve the command-line interface of json.tool (closes #21000) | Benjamin Peterson | 2014-03-22 | 1 | -0/+51 |
|/ | | | | A patch from Berker Peksag. | ||||
* | Documenting that json.load may raise a ValueError. | Felix Crux | 2013-08-12 | 1 | -0/+2 |
| | | | | | Issue #18680: JSONDecoder should document that it raises a ValueError for malformed data | ||||
* | Documenting that json.load may raise a ValueError. | Felix Crux | 2013-08-12 | 1 | -0/+2 |
| | | | | | Issue #18680: JSONDecoder should document that it raises a ValueError for malformed data | ||||
* | Documenting that json.load may raise a ValueError. | Felix Crux | 2013-08-12 | 1 | -0/+2 |
| | | | | | Issue #18680: JSONDecoder should document that it raises a ValueError for malformed data | ||||
* | Close #18264: int- and float-derived enums now converted to int or float. | Ethan Furman | 2013-08-10 | 1 | -17/+20 |
| | |||||
* | #17438: merge with 3.3. | Ezio Melotti | 2013-03-29 | 1 | -5/+12 |
|\ | |||||
| * | #17438: add links to the conversion tables in dump(s)/load(s). | Ezio Melotti | 2013-03-29 | 1 | -5/+12 |
| | | |||||
* | | Merge #16057: Clarify why the base method default is called in custom encoders. | R David Murray | 2013-03-18 | 1 | -0/+2 |
|\ \ | |/ | | | | | Original patch by Kushal Das. | ||||
| * | #16057: Clarify why the base method default is called in custom encoders. | R David Murray | 2013-03-18 | 1 | -0/+2 |
| | | | | | | | | Original patch by Kushal Das. | ||||
* | | Issue #17332: fix json doc typo /convered/converted/ found by Ernie Hershey. | Terry Jan Reedy | 2013-03-09 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Issue #17332: fix json doc typo /convered/converted/ found by Ernie Hershey. | Terry Jan Reedy | 2013-03-09 | 1 | -1/+1 |
| | | |||||
* | | Issue #17225: JSON decoder now counts columns in the first line starting | Serhiy Storchaka | 2013-02-21 | 1 | -1/+1 |
|\ \ | |/ | | | | | with 1, as in other lines. | ||||
| * | Issue #17225: JSON decoder now counts columns in the first line starting | Serhiy Storchaka | 2013-02-21 | 1 | -1/+1 |
| | | | | | | | | with 1, as in other lines. | ||||
| * | #16333: document a way to get rid of trailing whitespace when indent is used. | Ezio Melotti | 2012-11-28 | 1 | -1/+14 |
| | | |||||
* | | #16333: use (",", ": ") as default separator when indent is specified to ↵ | Ezio Melotti | 2012-11-28 | 1 | -5/+13 |
|/ | | | | avoid trailing whitespace. Patch by Serhiy Storchaka. | ||||
* | Issue #14570: Document json sort_keys parameter properly. | Andrew Svetlov | 2012-10-28 | 1 | -2/+11 |
| | | | | Patch by Chris Rebert. | ||||
* | #11964: Document a change in v3.2 to the json indent parameter | Petri Lehtinen | 2012-08-28 | 1 | -4/+12 |
| | |||||
* | Fix a JSON doc typo | Petri Lehtinen | 2012-08-27 | 1 | -1/+1 |
| | |||||
* | Add glossary references | Antoine Pitrou | 2012-08-24 | 1 | -3/+3 |
| | |||||
* | Issue #14674: Add a discussion of the json module's standard compliance. | Antoine Pitrou | 2012-08-24 | 1 | -6/+111 |
| | | | | Patch by Chris Rebert. | ||||
* | Issue #5067: improve some json error messages. | Antoine Pitrou | 2012-06-28 | 1 | -1/+1 |
| | | | | Patch by Serhiy Storchaka. | ||||
* | Fix `versionchanged` tags for json.load | Hynek Schlawack | 2012-05-20 | 1 | -1/+1 |
| | | | | `versionchanged` tags about 2.7 are useless in 3.x branches. | ||||
* | Document when json.load's parse_constant behaviour changed | Hynek Schlawack | 2012-05-20 | 1 | -0/+3 |
| | | | | It doesn't get called on 'null', 'true', 'false' since f686aced02a3. | ||||
* | #14692 Fix json docs to reflect changes in json.load | Hynek Schlawack | 2012-05-16 | 1 | -2/+2 |
| | | | | | | | The behaviour of the parse_constant callback changed insofar that 'null', 'true', 'false' don't trigger its call anymore. Patch by Serhiy Storchaka | ||||
* | Fix highlight and spacing in json example. | Ezio Melotti | 2012-04-14 | 1 | -4/+4 |
| | |||||
* | 3.2 explain json.dumps for non-string keys in dicts. closes issue6566. Patch ↵ | Senthil Kumaran | 2012-03-17 | 1 | -0/+8 |
| | | | | contributed Kirubakaran Athmanathan | ||||
* | Document json.dump ensure_ascii parameter (#13770) | Éric Araujo | 2012-01-16 | 1 | -0/+4 |
| | |||||
* | 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 | Georg Brandl | 2011-04-16 | 1 | -3/+4 |
|\ \ | |/ | |||||
| * | Small wording fix. | Georg Brandl | 2011-04-16 | 1 | -3/+4 |
| | | |||||
* | | #4783: Merge with 3.1. | Ezio Melotti | 2011-04-15 | 1 | -0/+5 |
|\ \ | |/ | |||||
| * | #4783: document that is not possible to use json.dump twice on the same stream. | Ezio Melotti | 2011-04-15 | 1 | -0/+5 |
| | | |||||
* | | Merge #10019: Fix regression relative to 2.6: add newlines if indent=0 | R David Murray | 2011-04-13 | 1 | -4/+4 |
|\ \ | |/ | | | | | Patch by Amaury Forgeot d'Arc, updated by Sando Tosi. | ||||
| * | #10019: Fix regression relative to 2.6: add newlines if indent=0 | R David Murray | 2011-04-13 | 1 | -3/+3 |
| | | | | | | | | Patch by Amaury Forgeot d'Arc, updated by Sando Tosi. | ||||
| * | Merged revisions 88137 via svnmerge from | Antoine Pitrou | 2011-01-21 | 1 | -11/+6 |
| | | | | | | | | | | | | | | | | | | | | svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r88137 | antoine.pitrou | 2011-01-21 22:37:32 +0100 (ven., 21 janv. 2011) | 3 lines Fix JSON docs about loads() accepting only str objects, not bytes. ........ | ||||
| * | Merged revisions 85530,85532-85534,85538-85543,85546-85548 via svnmerge from | Georg Brandl | 2010-11-26 | 1 | -3/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | svn+ssh://svn.python.org/python/branches/py3k ........ r85530 | georg.brandl | 2010-10-15 17:32:05 +0200 (Fr, 15 Okt 2010) | 1 line Refrain from using inline suites. ........ r85532 | georg.brandl | 2010-10-15 18:03:02 +0200 (Fr, 15 Okt 2010) | 1 line #7771: reference to documentation of dictview methods and operations. ........ r85533 | georg.brandl | 2010-10-15 18:07:41 +0200 (Fr, 15 Okt 2010) | 1 line #9683: remove broken dead code dealing with nested arguments removed from Py3k, and update the docs and docstrings accordingly. ........ r85534 | georg.brandl | 2010-10-15 18:19:43 +0200 (Fr, 15 Okt 2010) | 1 line #9801: document how list and dict proxies created by Managers behave w.r.t. mutable items. ........ r85538 | georg.brandl | 2010-10-15 18:35:46 +0200 (Fr, 15 Okt 2010) | 1 line #7303: add documentation for useful pkgutil functions and classes. ........ r85539 | georg.brandl | 2010-10-15 18:42:14 +0200 (Fr, 15 Okt 2010) | 1 line Fix issue references. ........ r85540 | georg.brandl | 2010-10-15 18:42:37 +0200 (Fr, 15 Okt 2010) | 1 line #6798: fix wrong docs for the arguments to several trace events. ........ r85541 | georg.brandl | 2010-10-15 18:53:24 +0200 (Fr, 15 Okt 2010) | 1 line #4968: updates to inspect.is* function docs. ........ r85542 | georg.brandl | 2010-10-15 19:01:15 +0200 (Fr, 15 Okt 2010) | 1 line #7790: move table of struct_time members to the actual description of struct_time. ........ r85543 | georg.brandl | 2010-10-15 19:03:02 +0200 (Fr, 15 Okt 2010) | 1 line #4785: document strict argument of JSONDecoder, plus add object_pairs_hook in the docstrings. ........ r85546 | georg.brandl | 2010-10-15 19:58:45 +0200 (Fr, 15 Okt 2010) | 1 line #5762: fix handling of empty namespace in minidom, which would result in AttributeError on toxml(). ........ r85547 | georg.brandl | 2010-10-15 20:00:35 +0200 (Fr, 15 Okt 2010) | 1 line #6098: Refrain from claiming DOM level 3 conformance in minidom. ........ r85548 | georg.brandl | 2010-10-15 21:46:19 +0200 (Fr, 15 Okt 2010) | 1 line #10072: assume a bit less knowledge of the FTP protocol in the ftplib docs. ........ |