Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity
102,793 Commits 7 Branches 587 Tags 2.3 GiB
Commit Graph

101 Commits

Author SHA1 Message Date
HongWeipeng f194479949 bpo-31553: add --json-lines option to json.tool (#10051) 
* add jsonlines option to json.tool

* code review

* fix:avoid read infile after it close

* improve doc in whatsnew 3.8
 2018-11-07 12:09:32 +02:00
Serhiy Storchaka 083a7a172b
bpo-35167: Specify program for gzip and json.tool command line options. (GH-10332) 2018-11-05 17:47:27 +02:00
Evan Allrich 9e84084851 bpo-34379: Doc: Move note for json.dump (GH-8730) 2018-08-11 16:34:02 +09:00
Anthony Sottile bb6366bd75 bpo-17909: Document that json.load can accept a binary IO (GH-7366) 2018-06-07 18:58:12 +09:00
Serhiy Storchaka 46936d5a71
Improve highlighting of some code blocks. (GH-6401) 2018-04-08 19:18:04 +03:00
INADA Naoki 629338f140
bpo-32360: Remove object_pairs_hook=OrderedDict examples (GH-5001) 2018-04-03 12:39:47 +09:00
Sergey Fedoseev a7fbad96c8 Make `json.dumps()` example to be PEP-8 compliant. (GH-3472) 2017-09-09 09:39:36 -07:00
Serhiy Storchaka 5becf38a03 Fix the signature of JSONDecodeError (no end parameter). (#1827) 
Unlikely to the simplejson module, json.JSONDecodeError doesn't accept the end argument.
 2017-05-27 16:11:18 +03:00
Martin Panter 574ff0680f Issues #29189: Merge indentation fixes from 3.5 2017-01-24 00:29:11 +00:00
Martin Panter ef107ee7a0 Issue #29189: Fix indentation in RST markup 2017-01-24 00:26:56 +00:00
Raymond Hettinger a57a8a3e2d Issue #29281: Fill-in a missing versionchanged entry 2017-01-19 21:39:37 -08:00
Serhiy Storchaka c7b1a0bbe2 Issue #28763: Use double hyphens (rendered as en-dashes) in numerical ranges 
in the documentation.
 2016-11-26 13:43:28 +02:00
Serhiy Storchaka 0264e46caa Issue #28763: Use double hyphens (rendered as en-dashes) in numerical ranges 
in the documentation.
 2016-11-26 13:49:59 +02:00
Serhiy Storchaka 58d3e54556 Fixed the documentation of parse_constant argument in json.load(). 
parse_constant doesn't get called on 'null', 'true', 'false' since 3.1/2.7.
 2016-11-12 22:48:33 +02:00
Serhiy Storchaka 022371ff94 Fixed the documentation of parse_constant argument in json.load(). 
parse_constant doesn't get called on 'null', 'true', 'false' since 3.1/2.7.
 2016-11-12 22:47:16 +02:00
Serhiy Storchaka 989db5c880 Issue #19795: Mark up None as literal text. 2016-10-19 16:37:13 +03:00
Serhiy Storchaka ecf41da83e Issue #19795: Mark up None as literal text. 2016-10-19 16:29:26 +03:00
Nick Coghlan b161562f72 Issue #17909: Accept binary input in json.loads 
json.loads (and hence json.load) now support binary input
encoded as UTF-8, UTF-16 or UTF-32.

Patch by Serhiy Storchaka.
 2016-09-10 20:16:18 +10:00
Serhiy Storchaka ee047e589d Issue #4945: Improved the documenting of boolean arguments in the json module. 
Based on patch by Gabriel Genellina.
 2016-06-30 14:03:21 +03:00
Serhiy Storchaka 15287f8bcc Issue #4945: Improved the documenting of boolean arguments in the json module. 
Based on patch by Gabriel Genellina.
 2016-06-30 13:59:12 +03:00
Terry Jan Reedy 58d3f59c2f Merge with 3.5 2016-06-22 22:46:51 -04:00
Terry Jan Reedy dcb6c88a24 Issue #27304: Source code links for sub-packages in the same file. 
Patch by Yoni Lavi
 2016-06-22 22:46:34 -04:00
Serhiy Storchaka aacd53f6cb Issue #18726: All optional parameters of the dump(), dumps(), 
load() and loads() functions and JSONEncoder and JSONDecoder class
constructors in the json module are now keyword-only.
 2016-06-22 00:03:20 +03:00
Terry Jan Reedy fa089b9b0b Issue #22558: Add remaining doc links to source code for Python-coded modules. 
Reformat header above separator line (added if missing) to a common format.
Patch by Yoni Lavi.
 2016-06-11 15:02:54 -04:00
Serhiy Storchaka 6dff0205b7 Issue #26736: Used HTTPS for external links in the documentation if possible. 2016-05-07 10:49:07 +03:00
Georg Brandl 5d94134040 Closes #25910: fix dead and permanently redirected links in the docs. Thanks to SilentGhost for the patch. 2016-02-26 19:37:12 +01:00
Martin Panter 84835ab1cb Issue #25161: Merge full stops from 3.4 into 3.5 2015-10-10 10:44:25 +00:00
Martin Panter d21e0b52f1 Issue #25161: Add full stops in documentation; patch by Takase Arihiro 2015-10-10 10:36:22 +00:00
Serhiy Storchaka 47efb4a5dc Issue #19361: JSON decoder now raises JSONDecodeError instead of ValueError. 2015-01-26 13:16:30 +02:00
Serhiy Storchaka 82e07b92b3 Issue #23181: More "codepoint" -> "code point". 2015-01-18 11:33:31 +02:00
Serhiy Storchaka d3faf43f9b Issue #23181: More "codepoint" -> "code point". 2015-01-18 11:28:37 +02:00
Serhiy Storchaka 7a6915e17d Issue #21514: The documentation of the json module now refers to new JSON RFC 
7159 instead of obsoleted RFC 4627.
 2014-11-27 19:41:47 +02:00
Serhiy Storchaka 715f01b565 Issue #21514: The documentation of the json module now refers to new JSON RFC 
7159 instead of obsoleted RFC 4627.
 2014-11-27 19:45:31 +02:00
Berker Peksag 39e4c4d873 Issue #21650: Add an `--sort-keys` option to json.tool CLI. 2014-11-10 09:56:54 +02:00
Georg Brandl cf3e788da4 merge with 3.4 2014-10-28 22:54:28 +01:00
Georg Brandl 946faa39e3 Using "-m module" is easier to read and understand than "-mmodule". 2014-10-28 22:54:24 +01:00
Georg Brandl 9e7fbde67f merge with 3.4 2014-09-21 00:38:13 +02:00
Benjamin Peterson fc8e9883be correct sphinx mark up for cmdline options (closes #21210) 2014-04-13 19:52:14 -04:00
Benjamin Peterson 940e207412 improve the command-line interface of json.tool (closes #21000) 
A patch from Berker Peksag.
 2014-03-21 23:17:29 -05:00
Felix Crux 654f003a13 Documenting that json.load may raise a ValueError. 
Issue #18680: JSONDecoder should document that it raises a ValueError
  for malformed data
 2013-08-12 17:39:51 -04:00
Felix Crux b435799520 Documenting that json.load may raise a ValueError. 
Issue #18680: JSONDecoder should document that it raises a ValueError
  for malformed data
 2013-08-12 17:39:51 -04:00
Felix Crux 60fb9719a1 Documenting that json.load may raise a ValueError. 
Issue #18680: JSONDecoder should document that it raises a ValueError
  for malformed data
 2013-08-12 17:39:51 -04:00
Ethan Furman a4998a7041 Close #18264: int- and float-derived enums now converted to int or float. 2013-08-10 13:01:45 -07:00
Ezio Melotti e612c1e29f #17438: merge with 3.3. 2013-03-29 04:02:14 +02:00
Ezio Melotti 6d2bc6e80b #17438: add links to the conversion tables in dump(s)/load(s). 2013-03-29 03:59:29 +02:00
R David Murray fbb1815491 Merge #16057: Clarify why the base method default is called in custom encoders. 
Original patch by Kushal Das.
 2013-03-17 21:53:48 -04:00
R David Murray dd246171e4 #16057: Clarify why the base method default is called in custom encoders. 
Original patch by Kushal Das.
 2013-03-17 21:52:35 -04:00
Terry Jan Reedy 11c08fd4b4 Issue #17332: fix json doc typo /convered/converted/ found by Ernie Hershey. 2013-03-08 19:40:17 -05:00
Terry Jan Reedy 9cbcc2f1c0 Issue #17332: fix json doc typo /convered/converted/ found by Ernie Hershey. 2013-03-08 19:35:15 -05:00
Serhiy Storchaka 920007ad76 Issue #17225: JSON decoder now counts columns in the first line starting 
with 1, as in other lines.
 2013-02-21 20:26:52 +02:00