summaryrefslogtreecommitdiffstats
path: root/Lib/json/decoder.py
Commit message (Collapse)AuthorAgeFilesLines
* Issue #18726: All optional parameters of the dump(), dumps(),Serhiy Storchaka2016-06-211-1/+1
| | | | | load() and loads() functions and JSONEncoder and JSONDecoder class constructors in the json module are now keyword-only.
* Issue #19361: JSON decoder now raises JSONDecodeError instead of ValueError.Serhiy Storchaka2015-01-261-45/+41
|
* Issue #11489: JSON decoder now accepts lone surrogates.Serhiy Storchaka2013-11-261-18/+17
|\
| * Issue #11489: JSON decoder now accepts lone surrogates.Serhiy Storchaka2013-11-261-18/+17
| |
* | Issue #18200: Back out usage of ModuleNotFoundError (8d28d44f3a9a)Brett Cannon2013-07-041-1/+1
| |
* | Issue #18200: Update the stdlib (except tests) to useBrett Cannon2013-06-141-1/+1
| | | | | | | | ModuleNotFoundError.
* | #17368: merge with 3.3.Ezio Melotti2013-03-121-1/+1
|\ \ | |/
| * #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-211-1/+1
|\ \ \ | |/ / | | | | | | with 1, as in other lines.
| * | Issue #17225: JSON decoder now counts columns in the first line startingSerhiy Storchaka2013-02-211-1/+1
| |\ \ | | |/ | | | | | | with 1, as in other lines.
| | * Issue #17225: JSON decoder now counts columns in the first line startingSerhiy Storchaka2013-02-211-1/+1
| | | | | | | | | | | | with 1, as in other lines.
* | | #16009: JSON error messages now provide more information. Patch by Serhiy ↵Ezio Melotti2013-01-031-7/+7
| | | | | | | | | | | | Storchaka.
* | | Cleanup json decoder: float() has builtin support of nan, +inf, -inf since ↵Victor Stinner2012-11-281-11/+3
|/ / | | | | | | Python 2.6
* | Issue #5067: improve some json error messages.Antoine Pitrou2012-06-281-5/+7
|\ \ | |/ | | | | Patch by Serhiy Storchaka.
| * Issue #5067: improve some json error messages.Antoine Pitrou2012-06-281-5/+7
| | | | | | | | Patch by Serhiy Storchaka.
* | Implement PEP 393.Martin v. Löwis2011-09-281-2/+1
|/
* #5723: merge with 3.1.Ezio Melotti2011-05-141-2/+2
|
* 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-131-0/+6
| | | | | | | | is not available.
| * #9233: Fix json to work properly even when _json is not available.Ezio Melotti2011-04-131-1/+1
| |
| * Merged revisions 85530,85532-85534,85538-85543,85546-85548 via svnmerge fromGeorg Brandl2010-11-261-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 ↵Georg Brandl2010-10-061-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. ........
* | #4785: document strict argument of JSONDecoder, plus add object_pairs_hook ↵Georg Brandl2010-10-151-0/+14
| | | | | | | | in the docstrings.
* | Issue #7451: Improve decoding performance of JSON objects, and reduceAntoine Pitrou2010-09-041-2/+8
| | | | | | | | | | the memory consumption of said decoded objects when they use the same strings as keys.
* | #9087: update json docstrings -- unicode and long do not exist anymore.Georg Brandl2010-08-021-6/+6
|/
* port simplejson upgrade from the trunk #4136Benjamin Peterson2009-05-021-139/+132
| | | | | | json also now works only with unicode strings Patch by Antoine Pitrou; updated by me
* Forward port r70471: Add object_pairs_hook. Issue 5381.Raymond Hettinger2009-04-211-3/+11
|
* merge r66932 and add a few py3k only checksBenjamin Peterson2008-10-161-2/+6
|
* #2834: Change re module semantics, so that str and bytes mixing is forbidden,Antoine Pitrou2008-08-191-1/+1
| | | | | and str (unicode) patterns get full unicode matching by default. The re.ASCII flag is also introduced to ask for ASCII matching instead.
* Merged revisions 62734,62736,62748,62769 via svnmerge fromChristian Heimes2008-05-081-0/+339
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 ........