Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-30 21:21:22 +00:00
Code Issues Projects Releases Packages Wiki Activity
116686 commits 7 branches 633 tags 3.5 GiB
Commit graph

118 commits

Author SHA1 Message Date
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
Serhiy Storchaka
c510a048ba Issue #17225: JSON decoder now counts columns in the first line starting 
with 1, as in other lines.
 2013-02-21 20:19:16 +02:00
Ezio Melotti
100314427a #16333: use (",", ": ") as default separator when indent is specified to avoid trailing whitespace. Patch by Serhiy Storchaka. 2012-11-29 00:42:56 +02:00
Andrew Svetlov
2ec53be2e2 Issue #14570: Document json sort_keys parameter properly. 
Patch by Chris Rebert.
 2012-10-28 14:10:30 +02:00
Petri Lehtinen
72b1426cfb #11964: Document a change in v3.2 to the json indent parameter 2012-08-28 07:08:44 +03:00
Petri Lehtinen
72c6eefcc6 Fix a JSON doc typo 2012-08-27 20:27:30 +03:00
Antoine Pitrou
15251a99bb Add glossary references 2012-08-24 19:49:08 +02:00
Antoine Pitrou
331624b67d Issue #14674: Add a discussion of the json module's standard compliance. 
Patch by Chris Rebert.
 2012-08-24 19:37:23 +02:00
Ezio Melotti
d654dedbbb #16333: document a way to get rid of trailing whitespace when indent is used. 2012-11-29 00:35:29 +02:00
Antoine Pitrou
2d24e94bbe Issue #5067: improve some json error messages. 
Patch by Serhiy Storchaka.
 2012-06-29 01:58:26 +02:00
Hynek Schlawack
f54c0604c8 Fix versionchanged tags for json.load 
`versionchanged` tags about 2.7 are useless in 3.x branches.
 2012-05-20 18:32:53 +02:00
Hynek Schlawack
1203e83d28 Document when json.load's parse_constant behaviour changed 
It doesn't get called on 'null', 'true', 'false' since f686aced02a3.
 2012-05-20 12:03:17 +02:00
Hynek Schlawack
9729fd4427 #14692 Fix json docs to reflect changes in json.load 
The behaviour of the parse_constant callback changed insofar that 'null',
'true', 'false' don't trigger its call anymore.

Patch by Serhiy Storchaka
 2012-05-16 19:01:04 +02:00
Ezio Melotti
84e59aa989 Fix highlight and spacing in json example. 2012-04-13 21:02:18 -06:00
Senthil Kumaran
f2123d2db5 3.2 explain json.dumps for non-string keys in dicts. closes issue6566. Patch contributed Kirubakaran Athmanathan 2012-03-17 00:40:34 -07:00
Éric Araujo
6f7aa00c1e Document json.dump ensure_ascii parameter (#13770) 2012-01-16 10:09:20 +01:00
Éric Araujo
fbeb1a9468 Merge 3.1 2011-04-24 02:42:52 +02:00
Éric Araujo
de579d4359 Add a space to make json doc a bit more readable 2011-04-21 02:37:41 +02:00
Georg Brandl
340d2690b3 Small wording fix. 2011-04-16 16:54:15 +02:00
Georg Brandl
10fe23b495 Merge with 3.1 2011-04-16 16:59:32 +02:00
Ezio Melotti
34d204bc85 #4783: Merge with 3.1. 2011-04-15 07:39:08 +03:00
Ezio Melotti
60adf95955 #4783: document that is not possible to use json.dump twice on the same stream. 2011-04-15 07:37:00 +03:00
R David Murray
d5315482e9 Merge #10019: Fix regression relative to 2.6: add newlines if indent=0 
Patch by Amaury Forgeot d'Arc, updated by Sando Tosi.
 2011-04-12 21:09:18 -04:00
R David Murray
3dd02d62c9 #10019: Fix regression relative to 2.6: add newlines if indent=0 
Patch by Amaury Forgeot d'Arc, updated by Sando Tosi.
 2011-04-12 21:02:45 -04:00
Benjamin Peterson
f3352e7c1f Merged revisions 88668 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r88668 | benjamin.peterson | 2011-02-27 09:06:44 -0600 (Sun, 27 Feb 2011) | 1 line

  make this a link #11345
........
 2011-02-27 15:15:06 +00:00
Antoine Pitrou
a970e62258 Merged revisions 88137 via svnmerge from 
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.
........
 2011-01-21 21:39:56 +00:00
Antoine Pitrou
00d650baaa Fix JSON docs about loads() accepting only str objects, not bytes. 2011-01-21 21:37:32 +00:00
Georg Brandl
c524cff3d3 Merged revisions 85530,85532-85534,85538-85543,85546-85548 via svnmerge from 
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.
........
 2010-11-26 08:42:45 +00:00
Raymond Hettinger
b643ef8f8e Issue #5729: json.dumps to support using '\t' as an indent string 2010-10-31 08:00:16 +00:00
Georg Brandl
d4460aaacd #4785: document strict argument of JSONDecoder, plus add object_pairs_hook in the docstrings. 2010-10-15 17:03:02 +00:00
Georg Brandl
57a5e3f0e2 Merged revisions 84249,84264,84326-84327,84407,84476,84480-84482,84484,84530-84531,84553,84619,84684,84915-84916 via svnmerge from 
svn+ssh://svn.python.org/python/branches/py3k

........
  r84249 | georg.brandl | 2010-08-22 01:20:01 +0200 (So, 22 Aug 2010) | 1 line

  Remove usage of rexec in tkinter demo.
........
  r84264 | georg.brandl | 2010-08-22 22:23:38 +0200 (So, 22 Aug 2010) | 1 line

  #9649: fix default value description.
........
  r84326 | georg.brandl | 2010-08-26 16:30:15 +0200 (Do, 26 Aug 2010) | 1 line

  #9689: add links from overview to in-depth class API descriptions.
........
  r84327 | georg.brandl | 2010-08-26 16:30:56 +0200 (Do, 26 Aug 2010) | 1 line

  #9681: typo.
........
  r84407 | georg.brandl | 2010-09-01 23:02:50 +0200 (Mi, 01 Sep 2010) | 1 line

  #9677: fix link.
........
  r84476 | georg.brandl | 2010-09-04 00:14:52 +0200 (Sa, 04 Sep 2010) | 1 line

  Use tabs consistently.
........
  r84480 | georg.brandl | 2010-09-04 00:33:27 +0200 (Sa, 04 Sep 2010) | 1 line

  More inclusive title.
........
  r84481 | georg.brandl | 2010-09-04 00:36:22 +0200 (Sa, 04 Sep 2010) | 1 line

  #9767: doctest run over json docs.
........
  r84482 | georg.brandl | 2010-09-04 00:40:02 +0200 (Sa, 04 Sep 2010) | 1 line

  #9760: clarify what context expression is.
........
  r84484 | georg.brandl | 2010-09-04 00:49:27 +0200 (Sa, 04 Sep 2010) | 1 line

  Fix missing word.
........
  r84530 | georg.brandl | 2010-09-05 19:07:12 +0200 (So, 05 Sep 2010) | 1 line

  #9747: fix copy-paste error in getresgid() doc.
........
  r84531 | georg.brandl | 2010-09-05 19:09:18 +0200 (So, 05 Sep 2010) | 1 line

  #9776: fix some spacing.
........
  r84553 | georg.brandl | 2010-09-06 08:49:07 +0200 (Mo, 06 Sep 2010) | 1 line

  #9780: both { and } are not valid fill characters.
........
  r84619 | georg.brandl | 2010-09-08 12:43:45 +0200 (Mi, 08 Sep 2010) | 1 line

  Add Lukasz.
........
  r84684 | georg.brandl | 2010-09-10 22:43:53 +0200 (Fr, 10 Sep 2010) | 1 line

  release() is probably not the most important method
........
  r84915 | georg.brandl | 2010-09-20 08:27:02 +0200 (Mo, 20 Sep 2010) | 1 line

  Fix typo.
........
  r84916 | georg.brandl | 2010-09-20 08:29:01 +0200 (Mo, 20 Sep 2010) | 1 line

  Mention % as string formatting.
........
 2010-10-06 08:54:16 +00:00
Georg Brandl
0bb73b8be8 #9767: doctest run over json docs. 2010-09-03 22:36:22 +00:00
Georg Brandl
6a74da3cdb #9649: fix default value description. 2010-08-22 20:23:38 +00:00
Georg Brandl
6c8583f79b Merged revisions 81365,81367 via svnmerge from 
svn+ssh://svn.python.org/python/branches/py3k

................
  r81365 | georg.brandl | 2010-05-19 22:57:08 +0200 (Mi, 19 Mai 2010) | 77 lines

  Merged revisions 80030,80067,80069,80080-80081,80084,80432-80433,80465-80470,81059,81065-81067 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r80030 | georg.brandl | 2010-04-13 08:43:54 +0200 (Di, 13 Apr 2010) | 1 line

    Get rid of multi-row cells.
  ........
    r80067 | georg.brandl | 2010-04-14 10:53:38 +0200 (Mi, 14 Apr 2010) | 1 line

    #5341: typo.
  ........
    r80069 | georg.brandl | 2010-04-14 15:50:31 +0200 (Mi, 14 Apr 2010) | 1 line

    Add an x-ref to where the O_ constants are documented and move the SEEK_ constants after lseek().
  ........
    r80080 | georg.brandl | 2010-04-14 21:16:38 +0200 (Mi, 14 Apr 2010) | 1 line

    #8399: add note about Windows and O_BINARY.
  ........
    r80081 | georg.brandl | 2010-04-14 23:34:44 +0200 (Mi, 14 Apr 2010) | 1 line

    #5250: document __instancecheck__ and __subclasscheck__.  I hope the part about the class/metaclass distinction is understandable.
  ........
    r80084 | georg.brandl | 2010-04-14 23:46:45 +0200 (Mi, 14 Apr 2010) | 1 line

    Fix missing.
  ........
    r80432 | georg.brandl | 2010-04-24 10:56:58 +0200 (Sa, 24 Apr 2010) | 1 line

    Markup fixes.
  ........
    r80433 | georg.brandl | 2010-04-24 11:08:10 +0200 (Sa, 24 Apr 2010) | 1 line

    #7507: quote "!" in pipes.quote(); it is a special character for some shells.
  ........
    r80465 | georg.brandl | 2010-04-25 12:29:17 +0200 (So, 25 Apr 2010) | 1 line

    Remove LaTeXy index entry syntax.
  ........
    r80466 | georg.brandl | 2010-04-25 12:54:42 +0200 (So, 25 Apr 2010) | 1 line

    Patch from Tim Hatch: Better cross-referencing in socket and winreg docs.
  ........
    r80467 | georg.brandl | 2010-04-25 12:55:16 +0200 (So, 25 Apr 2010) | 1 line

    Patch from Tim Hatch: Remove reference to winreg being the fabled high-level registry interface.
  ........
    r80468 | georg.brandl | 2010-04-25 12:55:58 +0200 (So, 25 Apr 2010) | 1 line

    Patch from Tim Hatch: Minor spelling changes to _winreg docs.
  ........
    r80469 | georg.brandl | 2010-04-25 12:56:41 +0200 (So, 25 Apr 2010) | 1 line

    Fix code example to have valid syntax so that it can be highlighted.
  ........
    r80470 | georg.brandl | 2010-04-25 12:57:15 +0200 (So, 25 Apr 2010) | 1 line

    Patch from Tim Hatch: Make socket setblocking <-> settimeout examples symmetric.
  ........
    r81059 | georg.brandl | 2010-05-10 23:02:51 +0200 (Mo, 10 Mai 2010) | 1 line

    #8642: fix wrong function name.
  ........
    r81065 | georg.brandl | 2010-05-10 23:46:50 +0200 (Mo, 10 Mai 2010) | 1 line

    Fix reference direction.
  ........
    r81066 | georg.brandl | 2010-05-10 23:50:57 +0200 (Mo, 10 Mai 2010) | 1 line

    Consolidate deprecation messages.
  ........
    r81067 | georg.brandl | 2010-05-10 23:51:33 +0200 (Mo, 10 Mai 2010) | 1 line

    Fix typo.
  ........
................
  r81367 | georg.brandl | 2010-05-19 23:03:51 +0200 (Mi, 19 Mai 2010) | 21 lines

  Recorded merge of revisions 80466-80469 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r80466 | georg.brandl | 2010-04-25 12:54:42 +0200 (So, 25 Apr 2010) | 1 line

    Patch from Tim Hatch: Better cross-referencing in socket and winreg docs.
  ........
    r80467 | georg.brandl | 2010-04-25 12:55:16 +0200 (So, 25 Apr 2010) | 1 line

    Patch from Tim Hatch: Remove reference to winreg being the fabled high-level registry interface.
  ........
    r80468 | georg.brandl | 2010-04-25 12:55:58 +0200 (So, 25 Apr 2010) | 1 line

    Patch from Tim Hatch: Minor spelling changes to _winreg docs.
  ........
    r80469 | georg.brandl | 2010-04-25 12:56:41 +0200 (So, 25 Apr 2010) | 1 line

    Fix code example to have valid syntax so that it can be highlighted.
  ........
................
 2010-05-19 21:22:58 +00:00