summaryrefslogtreecommitdiffstats
path: root/Lib/json
Commit message (Collapse)AuthorAgeFilesLines
* Remove mentions of Python 2.x and being externally maintained fromGregory P. Smith2013-12-081-5/+2
| | | | | the bundled json module. Replace that with a mention of it being a version of the externally maintained simplejson module.
* Issue #11489: JSON decoder now accepts lone surrogates.Serhiy Storchaka2013-11-261-18/+17
|
* Merge #16057: Clarify why the base method default is called in custom encoders.R David Murray2013-03-181-0/+1
|\ | | | | | | Original patch by Kushal Das.
| * #16057: Clarify why the base method default is called in custom encoders.R David Murray2013-03-181-0/+1
| | | | | | | | Original patch by Kushal Das.
* | #17368: merge with 3.2.Ezio Melotti2013-03-121-1/+1
|\ \ | |/
| * #17368: Fix an off-by-one error in the Python JSON decoder that caused a ↵Ezio Melotti2013-03-121-1/+1
| | | | | | | | failure while decoding empty object literals when object_pairs_hook was specified.
* | Issue #17225: JSON decoder now counts columns in the first line startingSerhiy Storchaka2013-02-213-3/+3
|\ \ | |/ | | | | with 1, as in other lines.
| * Issue #17225: JSON decoder now counts columns in the first line startingSerhiy Storchaka2013-02-213-3/+3
| | | | | | | | with 1, as in other lines.
* | #16476: merge with 3.2.Ezio Melotti2012-11-291-1/+2
|\ \ | |/
| * #16476: Fix json.tool to avoid including trailing whitespace.Ezio Melotti2012-11-291-1/+2
| |
* | #16549: merge with 3.2.Ezio Melotti2012-11-291-9/+11
|\ \ | |/
| * #16549: Make json.tool work again on Python 3 and add tests. Initial patch ↵Ezio Melotti2012-11-291-9/+11
| | | | | | | | by Berker Peksag and Serhiy Storchaka.
* | #16333: merge with 3.2.Ezio Melotti2012-11-282-5/+12
|\ \ | |/
| * #16333: document a way to get rid of trailing whitespace when indent is used.Ezio Melotti2012-11-282-5/+12
| |
* | Merge issue #14570: Document json sort_keys parameter properly.Andrew Svetlov2012-10-281-6/+12
|\ \ | |/ | | | | Patch by Chris Rebert.
| * Issue #14570: Document json sort_keys parameter properly.Andrew Svetlov2012-10-281-6/+12
| | | | | | | | Patch by Chris Rebert.
* | Issue #5067: improve some json error messages.Antoine Pitrou2012-06-283-7/+9
|\ \ | |/ | | | | Patch by Serhiy Storchaka.
| * Issue #5067: improve some json error messages.Antoine Pitrou2012-06-283-7/+9
| | | | | | | | Patch by Serhiy Storchaka.
* | #14875: merge with 3.2.Ezio Melotti2012-05-211-2/+1
|\ \ | |/
| * #14875: Use float('inf') instead of float('1e66666') in the json module.Ezio Melotti2012-05-211-2/+1
| |
* | Merge 3.2: Issue #13703 plus some related test suite fixes.Georg Brandl2012-02-201-1/+3
|\ \ | |/
| * Merge from 3.1: Issue #13703: add a way to randomize the hash values of ↵Georg Brandl2012-02-201-1/+3
| |\ | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * Issue #13703: add a way to randomize the hash values of basic types (str, ↵Georg Brandl2012-02-201-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * #5723: Improve json tests to be executed with and without accelerations.Ezio Melotti2011-05-1417-193/+245
| | |
| | * #12051: Fix segfault in json.dumps() while encoding highly-nested objects ↵Ezio Melotti2011-05-101-1/+20
| | | | | | | | | | | | using the C accelerations.
| | * #12017: Fix segfault in json.loads() while decoding highly-nested objects ↵Ezio Melotti2011-05-071-0/+12
| | | | | | | | | | | | using the C accelerations.
* | | Implement PEP 393.Martin v. Löwis2011-09-281-2/+1
|/ /
* | #5723: merge with 3.1.Ezio Melotti2011-05-141-2/+2
| |
* | Merge 3.1Éric Araujo2011-04-241-1/+1
|\ \ | |/
| * Add a space to make json doc a bit more readableÉric Araujo2011-04-211-1/+1
| |
* | Merge with 3.1.Ezio Melotti2011-04-131-0/+6
|\ \ | |/
| * #9233: Fix json.loads({}) to return a dict (instead of a list), when _json ↵Ezio Melotti2011-04-132-0/+11
| | | | | | | | is not available.
| * Remove unnecessary imports and use assertIs instead of assertTrue.Ezio Melotti2011-04-132-5/+3
| |
| * #9233: Fix json to work properly even when _json is not available.Ezio Melotti2011-04-132-1/+2
| |
| * #9233: skip _json-specific tests when _json is not available.Ezio Melotti2011-04-132-2/+14
| |
* | Merge #10019: Fix regression relative to 2.6: add newlines if indent=0R David Murray2011-04-131-1/+1
|\ \ | |/ | | | | Patch by Amaury Forgeot d'Arc, updated by Sando Tosi.
| * #10019: Fix regression relative to 2.6: add newlines if indent=0R David Murray2011-04-132-1/+17
| | | | | | | | Patch by Amaury Forgeot d'Arc, updated by Sando Tosi.
| * Merged revisions 88137 via svnmerge fromAntoine Pitrou2011-01-211-0/+2
| | | | | | | | | | | | | | | | | | | | 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. ........
| * Merged revisions 85530,85532-85534,85538-85543,85546-85548 via svnmerge fromGeorg Brandl2010-11-262-4/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. ........
| * Merged revisions 86596 via svnmerge fromEzio Melotti2010-11-2114-59/+59
| | | | | | | | | | | | | | | | | | | | svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r86596 | ezio.melotti | 2010-11-20 21:04:17 +0200 (Sat, 20 Nov 2010) | 1 line #9424: Replace deprecated assert* methods in the Python test suite. ........
| * Merged revisions ↵Georg Brandl2010-10-063-23/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. ........
| * Merged revisions ↵Florent Xicluna2010-08-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 83212,83829,83833,83838-83839,83878,84019,84025,84028,84032,84036 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r83212 | florent.xicluna | 2010-07-28 18:39:41 +0200 (mer., 28 juil. 2010) | 2 lines Syntax cleanup. ........ r83829 | florent.xicluna | 2010-08-08 18:16:07 +0200 (dim., 08 août 2010) | 2 lines Use unittest specific methods for some urllib test cases. And replace urllib2 with urllib.request in comments. ........ r83833 | florent.xicluna | 2010-08-08 18:25:27 +0200 (dim., 08 août 2010) | 2 lines Add test case for the HTTPResponse being an iterable. Follow-up of issue #4608. ........ r83838 | florent.xicluna | 2010-08-08 20:03:44 +0200 (dim., 08 août 2010) | 2 lines Typo. ........ r83839 | florent.xicluna | 2010-08-08 20:06:13 +0200 (dim., 08 août 2010) | 2 lines Issue #7564: Skip test_ioctl if another process is attached to /dev/tty. ........ r83878 | florent.xicluna | 2010-08-09 10:29:08 +0200 (lun., 09 août 2010) | 1 line Merge the 2to3 script from /sandbox/trunk/2to3/2to3, revision 72867 (latest). ........ r84019 | florent.xicluna | 2010-08-14 17:56:42 +0200 (sam., 14 août 2010) | 11 lines Merged manually from 2.7 branch to 3.x trunk. ------------------------------------------------------------------------ r79925 | nick.coghlan | 2010-04-10 16:24:36 +0200 (sam. 10 avril 2010) Try to turn some buildbots green by allowing test_multiprocessing to pass even if it hits the sys.exc_clear code in the threading module, and improve the test coverage by making the ctypes dependencies a bit more granular (two of the cited ctypes objects don't exist on my system) ------------------------------------------------------------------------ ........ r84025 | florent.xicluna | 2010-08-14 18:56:27 +0200 (sam., 14 août 2010) | 1 line List Misc/python-config.in in Misc/README. Fix few typos. ........ r84028 | florent.xicluna | 2010-08-14 19:02:49 +0200 (sam., 14 août 2010) | 1 line Fix order. ........ r84032 | florent.xicluna | 2010-08-14 19:15:31 +0200 (sam., 14 août 2010) | 1 line Convert to spaces. ........ r84036 | florent.xicluna | 2010-08-14 20:03:19 +0200 (sam., 14 août 2010) | 1 line Remove bad merge (from svnmerge r82301) ........
| * Merged revisions 83016 via svnmerge fromDoug Hellmann2010-07-211-0/+9
| | | | | | | | | | | | | | | | | | | | svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r83016 | doug.hellmann | 2010-07-21 08:29:04 -0400 (Wed, 21 Jul 2010) | 1 line Apply patch from Ray Allen for issue 9296 ........
| * Merged revisions 76710 via svnmerge fromAntoine Pitrou2009-12-081-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r76710 | antoine.pitrou | 2009-12-08 16:57:31 +0100 (mar., 08 déc. 2009) | 10 lines Merged revisions 76708 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r76708 | antoine.pitrou | 2009-12-08 16:40:51 +0100 (mar., 08 déc. 2009) | 4 lines Issue #6986: Fix crash in the JSON C accelerator when called with the wrong parameter types. Patch by Victor Stinner. ........ ................
| * Merged revisions 73715 via svnmerge fromGeorg Brandl2009-08-132-4/+4
| | | | | | | | | | | | | | | | | | | | svn+ssh://svn.python.org/python/branches/py3k ........ r73715 | benjamin.peterson | 2009-07-01 01:06:06 +0200 (Mi, 01 Jul 2009) | 1 line convert old fail* assertions to assert* ........
* | Fix JSON docs about loads() accepting only str objects, not bytes.Antoine Pitrou2011-01-211-0/+2
| |
* | Issue #10572: Moved json tests to Lib/test/json_tests.Alexander Belopolsky2010-11-3016-751/+0
| | | | | | | | Approved by Raymond Hettinger.
* | Remove unnecessary import.Barry Warsaw2010-11-241-1/+0
| |
* | #9424: Replace deprecated assert* methods in the Python test suite.Ezio Melotti2010-11-2014-61/+61
| |
* | Issue #5729: json.dumps to support using '\t' as an indent stringRaymond Hettinger2010-10-312-22/+29
| |
generated by cgit v0.12 at 2024-11-22 21:30:56 (GMT)