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
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
39e4c4d873
Issue #21650 : Add an `--sort-keys` option to json.tool CLI.
2014-11-10 09:56:54 +02:00
cf3e788da4
merge with 3.4
2014-10-28 22:54:28 +01:00
946faa39e3
Using "-m module" is easier to read and understand than "-mmodule".
2014-10-28 22:54:24 +01:00
9e7fbde67f
merge with 3.4
2014-09-21 00:38:13 +02:00
fc8e9883be
correct sphinx mark up for cmdline options ( closes #21210 )
2014-04-13 19:52:14 -04:00
940e207412
improve the command-line interface of json.tool ( closes #21000 )
...
A patch from Berker Peksag.
2014-03-21 23:17:29 -05:00
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
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
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
a4998a7041
Close #18264 : int- and float-derived enums now converted to int or float.
2013-08-10 13:01:45 -07:00
e612c1e29f
#17438 : merge with 3.3.
2013-03-29 04:02:14 +02:00
6d2bc6e80b
#17438 : add links to the conversion tables in dump(s)/load(s).
2013-03-29 03:59:29 +02:00
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
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
11c08fd4b4
Issue #17332 : fix json doc typo /convered/converted/ found by Ernie Hershey.
2013-03-08 19:40:17 -05:00
9cbcc2f1c0
Issue #17332 : fix json doc typo /convered/converted/ found by Ernie Hershey.
2013-03-08 19:35:15 -05:00
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
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
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
2ec53be2e2
Issue #14570 : Document json sort_keys parameter properly.
...
Patch by Chris Rebert.
2012-10-28 14:10:30 +02:00
72b1426cfb
#11964 : Document a change in v3.2 to the json indent parameter
2012-08-28 07:08:44 +03:00
72c6eefcc6
Fix a JSON doc typo
2012-08-27 20:27:30 +03:00
15251a99bb
Add glossary references
2012-08-24 19:49:08 +02:00
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
d654dedbbb
#16333 : document a way to get rid of trailing whitespace when indent is used.
2012-11-29 00:35:29 +02:00
2d24e94bbe
Issue #5067 : improve some json error messages.
...
Patch by Serhiy Storchaka.
2012-06-29 01:58:26 +02:00
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
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
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
84e59aa989
Fix highlight and spacing in json example.
2012-04-13 21:02:18 -06:00
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
6f7aa00c1e
Document json.dump ensure_ascii parameter ( #13770 )
2012-01-16 10:09:20 +01:00
fbeb1a9468
Merge 3.1
2011-04-24 02:42:52 +02:00
de579d4359
Add a space to make json doc a bit more readable
2011-04-21 02:37:41 +02:00
340d2690b3
Small wording fix.
2011-04-16 16:54:15 +02:00
10fe23b495
Merge with 3.1
2011-04-16 16:59:32 +02:00
34d204bc85
#4783 : Merge with 3.1.
2011-04-15 07:39:08 +03:00
60adf95955
#4783 : document that is not possible to use json.dump twice on the same stream.
2011-04-15 07:37:00 +03:00
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
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
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
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
00d650baaa
Fix JSON docs about loads() accepting only str objects, not bytes.
2011-01-21 21:37:32 +00:00
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
b643ef8f8e
Issue #5729 : json.dumps to support using '\t' as an indent string
2010-10-31 08:00:16 +00:00
d4460aaacd
#4785 : document strict argument of JSONDecoder, plus add object_pairs_hook in the docstrings.
2010-10-15 17:03:02 +00:00
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
0bb73b8be8
#9767 : doctest run over json docs.
2010-09-03 22:36:22 +00:00
Serhiy Storchaka
Berker Peksag
Georg Brandl
Benjamin Peterson
Felix Crux
Ethan Furman
Ezio Melotti
R David Murray
Terry Jan Reedy
Andrew Svetlov
Petri Lehtinen
Antoine Pitrou
Hynek Schlawack
Senthil Kumaran
Éric Araujo
Raymond Hettinger