| 
								
								
									 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-keysoption 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 versionchangedtags 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 |  |