cpython

Commit Graph

Author	SHA1	Message	Date
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	9f94b6dc4b	#16333 : fix example in docstring.	2012-11-29 00:45:22 +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
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
Georg Brandl	2daf6ae249	Issue #13703 : add a way to randomize the hash values of basic types (str, bytes, datetime) in order to make algorithmic complexity attacks on (e.g.) web apps much more complicated. The environment variable PYTHONHASHSEED and the new command line flag -R control this behavior.	2012-02-20 19:54:16 +01:00
Éric Araujo	de579d4359	Add a space to make json doc a bit more readable	2011-04-21 02:37:41 +02: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
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
Georg Brandl	4009c9edfc	Merged revisions 82805-82806,83523-83527,83536,83538,83542,83546-83548,83550-83555,83558,83560 via svnmerge from svn+ssh://svn.python.org/python/branches/py3k ........ r82805 \| georg.brandl \| 2010-07-11 11:42:10 +0200 (So, 11 Jul 2010) \| 1 line #7935: cross-reference to ast.literal_eval() from eval() docs. ........ r82806 \| georg.brandl \| 2010-07-11 12:22:44 +0200 (So, 11 Jul 2010) \| 1 line #9223: link to Command class reference, and move Command interface docs nearer to class docs. ........ r83523 \| georg.brandl \| 2010-08-02 14:06:18 +0200 (Mo, 02 Aug 2010) \| 1 line #9209 and #7781: fix two crashes in pstats interactive browser. ........ r83524 \| georg.brandl \| 2010-08-02 14:20:23 +0200 (Mo, 02 Aug 2010) \| 1 line #9428: fix running scripts from profile/cProfile with their own name and the right namespace. Same fix as for trace.py in #1690103. ........ r83525 \| georg.brandl \| 2010-08-02 14:36:24 +0200 (Mo, 02 Aug 2010) \| 1 line Get rid of spurious "threading" entries in trace output. ........ r83526 \| georg.brandl \| 2010-08-02 14:40:22 +0200 (Mo, 02 Aug 2010) \| 1 line Fix softspace relic. ........ r83527 \| georg.brandl \| 2010-08-02 14:48:46 +0200 (Mo, 02 Aug 2010) \| 1 line #3821: beginnings of a trace.py unittest. ........ r83536 \| georg.brandl \| 2010-08-02 19:49:25 +0200 (Mo, 02 Aug 2010) \| 1 line #8578: mention danger of not incref'ing weak referenced object. ........ r83538 \| georg.brandl \| 2010-08-02 20:10:13 +0200 (Mo, 02 Aug 2010) \| 1 line #6928: fix class docs w.r.t. new metaclasses. ........ r83542 \| georg.brandl \| 2010-08-02 20:56:54 +0200 (Mo, 02 Aug 2010) \| 1 line Move test_SimpleHTTPServer into test_httpservers. ........ r83546 \| georg.brandl \| 2010-08-02 21:16:34 +0200 (Mo, 02 Aug 2010) \| 1 line #7973: Fix distutils options spelling. ........ r83547 \| georg.brandl \| 2010-08-02 21:19:26 +0200 (Mo, 02 Aug 2010) \| 1 line #7386: add example that shows that trailing path separators are stripped. ........ r83548 \| georg.brandl \| 2010-08-02 21:23:34 +0200 (Mo, 02 Aug 2010) \| 1 line #8172: how does one use a property? ........ r83550 \| georg.brandl \| 2010-08-02 21:32:43 +0200 (Mo, 02 Aug 2010) \| 1 line #9451: strengthen warning about __*__ special name usage. ........ r83551 \| georg.brandl \| 2010-08-02 21:35:06 +0200 (Mo, 02 Aug 2010) \| 1 line Remove XXX comment that was displayed. ........ r83552 \| georg.brandl \| 2010-08-02 21:36:36 +0200 (Mo, 02 Aug 2010) \| 1 line #9438: clarify that constant names also cannot be assigned as attributes. ........ r83553 \| georg.brandl \| 2010-08-02 21:39:17 +0200 (Mo, 02 Aug 2010) \| 1 line Remove redundant information. ........ r83554 \| georg.brandl \| 2010-08-02 21:43:05 +0200 (Mo, 02 Aug 2010) \| 1 line #7280: note about nasmw.exe. ........ r83555 \| georg.brandl \| 2010-08-02 21:44:48 +0200 (Mo, 02 Aug 2010) \| 1 line #8861: remove unused variable. ........ r83558 \| georg.brandl \| 2010-08-02 22:05:19 +0200 (Mo, 02 Aug 2010) \| 1 line #8648: document UTF-7 codec functions. ........ r83560 \| georg.brandl \| 2010-08-02 22:16:18 +0200 (Mo, 02 Aug 2010) \| 1 line #9087: update json docstrings -- unicode and long do not exist anymore. ........	2010-10-06 08:26:09 +00:00
Benjamin Peterson	c6b607d4a9	port simplejson upgrade from the trunk #4136 json also now works only with unicode strings Patch by Antoine Pitrou; updated by me	2009-05-02 12:36:44 +00:00
Raymond Hettinger	0ad98d8509	Forward port r70471: Add object_pairs_hook. Issue 5381.	2009-04-21 03:09:17 +00:00
Christian Heimes	90540004d3	Merged revisions 62734,62736,62748,62769 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62734 \| brett.cannon \| 2008-05-05 22:21:38 +0200 (Mon, 05 May 2008) \| 5 lines Add the 'json' package. Code taken from simplejson 1.9 and contributed by Bob Ippolito. Closes issue #2750. ........ r62736 \| georg.brandl \| 2008-05-05 22:53:39 +0200 (Mon, 05 May 2008) \| 2 lines Fix JSON module docs. ........ r62748 \| benjamin.peterson \| 2008-05-06 04:51:10 +0200 (Tue, 06 May 2008) \| 2 lines PEP 8 nits in json package ........ r62769 \| christian.heimes \| 2008-05-06 18:18:41 +0200 (Tue, 06 May 2008) \| 2 lines Intern static string Use float constructors instead of magic code for float constants ........	2008-05-08 14:29:10 +00:00

15 Commits