cpython

Commit Graph

Author	SHA1	Message	Date
Antoine Pitrou	d9a5137742	Issue #5067 : improve some json error messages. Patch by Serhiy Storchaka.	14 years ago
Amaury Forgeot d'Arc	dee76e627d	Issue #13774 : json: Fix a SystemError when a bogus encoding is passed to json.loads().	15 years ago
Ezio Melotti	c1ec7b5d44	#12051 : Fix segfault in json.dumps() while encoding highly-nested objects using the C accelerations.	15 years ago
Ezio Melotti	cec464951e	#12017 : Fix segfault in json.loads() while decoding highly-nested objects using the C accelerations.	15 years ago
Ezio Melotti	f5164f6e93	#11982 : remove now unused function.	15 years ago
Ezio Melotti	df8a8f768d	#11982 : fix json.loads('""') to return u'' rather than ''.	15 years ago
Georg Brandl	d823bdcb0e	#10804 : fix copy-paste error when checking assigned fields for NULL.	16 years ago
Antoine Pitrou	2397dd58b7	Issue #10314 : improve performance of JSON encoding with sort_keys=True	16 years ago
Barry Warsaw	fa6582752a	Issue 10038. Restore the Python 2.6 behavior that json.loads() always returns unicode. Patch by Patch by Walter Dörwald.	16 years ago
Raymond Hettinger	cbba8d4c7a	Backport r72961 fixing issue #6105 : json.dumps not following OrderedDict iteration order.	16 years ago
Antoine Pitrou	22ad24528e	Merged revisions 85342 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r85342 \| antoine.pitrou \| 2010-10-09 17:24:28 +0200 (sam., 09 oct. 2010) \| 4 lines Issue #10055: Make json C89-compliant in UCS4 mode. ........	16 years ago
Antoine Pitrou	ae136da881	Merged revisions 85342 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r85342 \| antoine.pitrou \| 2010-10-09 17:24:28 +0200 (sam., 09 oct. 2010) \| 4 lines Issue #10055: Make json C89-compliant in UCS4 mode. ........	16 years ago
Antoine Pitrou	5b0e9e84e9	Issue #10055 : Make json C89-compliant in UCS4 mode.	16 years ago
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. ........	16 years ago
Antoine Pitrou	7d6e076f6d	Issue #7451 : Improve decoding performance of JSON objects, and reduce the memory consumption of said decoded objects when they use the same strings as keys.	16 years ago
Georg Brandl	c8284cfc57	#9087 : update json docstrings -- unicode and long do not exist anymore.	16 years ago
Doug Hellmann	f31db93fc1	Apply patch from Ray Allen for issue 9296	16 years ago
Doug Hellmann	76e57947a1	Merged revisions 83016 via svnmerge from 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 ........	16 years ago
Doug Hellmann	1c524754f6	Apply patch from Ray Allen for issue 9296	16 years ago
Antoine Pitrou	7f14f0d8a0	Recorded merge of revisions 81032 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r81032 \| antoine.pitrou \| 2010-05-09 17:52:27 +0200 (dim., 09 mai 2010) \| 9 lines Recorded merge of revisions 81029 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r81029 \| antoine.pitrou \| 2010-05-09 16:46:46 +0200 (dim., 09 mai 2010) \| 3 lines Untabify C files. Will watch buildbots. ........ ................	16 years ago
Antoine Pitrou	f95a1b3c53	Recorded merge of revisions 81029 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r81029 \| antoine.pitrou \| 2010-05-09 16:46:46 +0200 (dim., 09 mai 2010) \| 3 lines Untabify C files. Will watch buildbots. ........	16 years ago
Brett Cannon	8e9757e432	Remove unneeded variable mutation and initializations. Found using Clang's static analyzer.	16 years ago
Antoine Pitrou	4fad6bdde9	Merged revisions 76710 via svnmerge from 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. ........ ................	17 years ago
Antoine Pitrou	781eba7972	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. ........	17 years ago
Antoine Pitrou	187177fc55	Issue #6986 : Fix crash in the JSON C accelerator when called with the wrong parameter types. Patch by Victor Stinner.	17 years ago
Eric Smith	129c97df02	Issue 7117: Replace PyOS_ascii_strtod with PyOS_string_to_double in _json.c as part of short float repr. Change made after consulting with Bob Ippolito. This completes the removal of calls to PyOS_ascii_strtod.	17 years ago
Raymond Hettinger	491a4cb8d9	Fix TODO: do the sort by just the key, not the key/value pair.	17 years ago
Raymond Hettinger	bcf6f92dc5	* Fix-up a TODO (support the sort_key option). * Fix an error where True/False were being written-out as title-cased strings when used a dictionary keys. * Speed-up iteration over dicts by looping over items() rather than keys() followed by value lookups. * TODO: sort only by keys, not keys and values.	17 years ago
Raymond Hettinger	c8d952dfe4	Issue 6105: json encoder to respect iteration order of its inputs.	17 years ago
Georg Brandl	596820539f	Merged revisions 72314 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r72314 \| georg.brandl \| 2009-05-05 09:48:12 +0200 (Di, 05 Mai 2009) \| 1 line #5932: fix error return in _convertPyInt_AsSsize_t() conversion function. ........	17 years ago
Georg Brandl	f71ba95e91	#5932 : fix error return in _convertPyInt_AsSsize_t() conversion function.	17 years ago
Hirokazu Yamamoto	fecf5d143a	Fixed warning. (Should not use const as variable name)	17 years ago
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	17 years ago
Bob Ippolito	76a982a027	Issue 5381: fix regression in pure python code path, Issue 5584: fix a decoder bug for unicode float literals outside of a container	17 years ago
Raymond Hettinger	a0b8d9ad2d	Silence a compiler warning.	17 years ago
Raymond Hettinger	91852ca673	Issue 5381: Add object_pairs_hook to the json module.	17 years ago
Bob Ippolito	d914e3f861	merge json library with simplejson 2.0.9 (issue 4136)	17 years ago
Georg Brandl	4aef703c45	Merged revisions 66801,66803-66804,66813,66854-66856,66866,66870-66872,66874,66887,66903,66905,66911,66913,66927,66932,66938,66942,66962,66964,66973-66974,66977,66992,66998-66999,67002,67005,67007,67028,67040-67041,67044,67070,67089,67091,67101,67117-67119,67123-67124 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ................ r66801 \| andrew.kuchling \| 2008-10-04 23:51:59 +0200 (Sat, 04 Oct 2008) \| 1 line Punctuation fix; expand dict.update docstring to be clearer ................ r66803 \| benjamin.peterson \| 2008-10-05 00:15:31 +0200 (Sun, 05 Oct 2008) \| 1 line fix typo ................ r66804 \| andrew.kuchling \| 2008-10-05 02:11:56 +0200 (Sun, 05 Oct 2008) \| 1 line #1415508 from Rocky Bernstein: add docstrings for enable_interspersed_args(), disable_interspersed_args() ................ r66813 \| andrew.kuchling \| 2008-10-06 14:07:04 +0200 (Mon, 06 Oct 2008) \| 3 lines Per Greg Ward, optparse is no longer being externally maintained. I'll look at the bugs in the Optik bug tracker and copy them to the Python bug tracker if they're still relevant. ................ r66854 \| georg.brandl \| 2008-10-08 19:20:20 +0200 (Wed, 08 Oct 2008) \| 2 lines #4059: patch up some sqlite docs. ................ r66855 \| georg.brandl \| 2008-10-08 19:30:55 +0200 (Wed, 08 Oct 2008) \| 2 lines #4058: fix some whatsnew markup. ................ r66856 \| georg.brandl \| 2008-10-08 20:47:17 +0200 (Wed, 08 Oct 2008) \| 3 lines #3935: properly support list subclasses in the C impl. of bisect. Patch reviewed by Raymond. ................ r66866 \| benjamin.peterson \| 2008-10-09 22:54:43 +0200 (Thu, 09 Oct 2008) \| 1 line update paragraph about __future__ for 2.6 ................ r66870 \| armin.rigo \| 2008-10-10 10:40:44 +0200 (Fri, 10 Oct 2008) \| 2 lines Typo: "ThreadError" is the name in the C source. ................ r66871 \| benjamin.peterson \| 2008-10-10 22:38:49 +0200 (Fri, 10 Oct 2008) \| 1 line fix a small typo ................ r66872 \| benjamin.peterson \| 2008-10-10 22:51:37 +0200 (Fri, 10 Oct 2008) \| 1 line talk about how you can unzip with zip ................ r66874 \| benjamin.peterson \| 2008-10-11 00:23:41 +0200 (Sat, 11 Oct 2008) \| 1 line PyGILState_Acquire -> PyGILState_Ensure ................ r66887 \| benjamin.peterson \| 2008-10-13 23:51:40 +0200 (Mon, 13 Oct 2008) \| 1 line document how to disable fixers ................ r66903 \| benjamin.peterson \| 2008-10-15 22:34:09 +0200 (Wed, 15 Oct 2008) \| 1 line don't recurse into directories that start with '.' ................ r66905 \| benjamin.peterson \| 2008-10-15 23:05:55 +0200 (Wed, 15 Oct 2008) \| 1 line support the optional line argument for idle ................ r66911 \| benjamin.peterson \| 2008-10-16 01:10:28 +0200 (Thu, 16 Oct 2008) \| 41 lines Merged revisions 66805,66841,66860,66884-66886,66893,66907,66910 via svnmerge from svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3 ........ r66805 \| benjamin.peterson \| 2008-10-04 20:11:02 -0500 (Sat, 04 Oct 2008) \| 1 line mention what the fixes directory is for ........ r66841 \| benjamin.peterson \| 2008-10-07 17:48:12 -0500 (Tue, 07 Oct 2008) \| 1 line use assertFalse and assertTrue ........ r66860 \| benjamin.peterson \| 2008-10-08 16:05:07 -0500 (Wed, 08 Oct 2008) \| 1 line instead of abusing the pattern matcher, use start_tree to find a next binding ........ r66884 \| benjamin.peterson \| 2008-10-13 15:50:30 -0500 (Mon, 13 Oct 2008) \| 1 line don't print tokens to stdout when -v is given ........ r66885 \| benjamin.peterson \| 2008-10-13 16:28:57 -0500 (Mon, 13 Oct 2008) \| 1 line add the -x option to disable fixers ........ r66886 \| benjamin.peterson \| 2008-10-13 16:33:53 -0500 (Mon, 13 Oct 2008) \| 1 line cut down on some crud ........ r66893 \| benjamin.peterson \| 2008-10-14 17:16:54 -0500 (Tue, 14 Oct 2008) \| 1 line add an optional set literal fixer ........ r66907 \| benjamin.peterson \| 2008-10-15 16:59:41 -0500 (Wed, 15 Oct 2008) \| 1 line don't write backup files by default ........ r66910 \| benjamin.peterson \| 2008-10-15 17:43:10 -0500 (Wed, 15 Oct 2008) \| 1 line add the -n option; it stops backupfiles from being written ........ ................ r66913 \| benjamin.peterson \| 2008-10-16 20:52:14 +0200 (Thu, 16 Oct 2008) \| 1 line document that deque indexing is O(n) #4123 ................ r66927 \| andrew.kuchling \| 2008-10-16 22:15:47 +0200 (Thu, 16 Oct 2008) \| 1 line Fix wording (2.6.1 backport candidate) ................ r66932 \| benjamin.peterson \| 2008-10-16 23:09:28 +0200 (Thu, 16 Oct 2008) \| 1 line check for error conditions in _json #3623 ................ r66938 \| benjamin.peterson \| 2008-10-16 23:27:54 +0200 (Thu, 16 Oct 2008) \| 1 line fix possible ref leak ................ r66942 \| benjamin.peterson \| 2008-10-16 23:48:06 +0200 (Thu, 16 Oct 2008) \| 1 line fix more possible ref leaks in _json and use Py_CLEAR ................ r66962 \| benjamin.peterson \| 2008-10-17 22:01:01 +0200 (Fri, 17 Oct 2008) \| 1 line clarify CALL_FUNCTION #4141 ................ r66964 \| georg.brandl \| 2008-10-17 23:41:49 +0200 (Fri, 17 Oct 2008) \| 2 lines Fix duplicate word. ................ r66973 \| armin.ronacher \| 2008-10-19 10:27:43 +0200 (Sun, 19 Oct 2008) \| 3 lines Fixed #4067 by implementing _attributes and _fields for the AST root node. ................ r66974 \| benjamin.peterson \| 2008-10-19 15:59:01 +0200 (Sun, 19 Oct 2008) \| 1 line fix compiler warning ................ r66977 \| benjamin.peterson \| 2008-10-19 21:39:16 +0200 (Sun, 19 Oct 2008) \| 1 line mention -n ................ r66992 \| benjamin.peterson \| 2008-10-21 22:51:13 +0200 (Tue, 21 Oct 2008) \| 1 line make sure to call iteritems() ................ r66998 \| benjamin.peterson \| 2008-10-22 22:57:43 +0200 (Wed, 22 Oct 2008) \| 1 line fix a few typos ................ r66999 \| benjamin.peterson \| 2008-10-22 23:05:30 +0200 (Wed, 22 Oct 2008) \| 1 line and another typo... ................ r67002 \| hirokazu.yamamoto \| 2008-10-23 02:37:33 +0200 (Thu, 23 Oct 2008) \| 1 line Issue #4183: Some tests didn't run with pickle.HIGHEST_PROTOCOL. ................ r67005 \| walter.doerwald \| 2008-10-23 15:11:39 +0200 (Thu, 23 Oct 2008) \| 2 lines Use the correct names of the stateless codec functions (Fixes issue 4178). ................ r67007 \| benjamin.peterson \| 2008-10-23 23:43:48 +0200 (Thu, 23 Oct 2008) \| 1 line only nonempty __slots__ don't work ................ r67028 \| benjamin.peterson \| 2008-10-26 01:27:07 +0200 (Sun, 26 Oct 2008) \| 1 line don't use a catch-all ................ r67040 \| armin.rigo \| 2008-10-28 18:01:21 +0100 (Tue, 28 Oct 2008) \| 5 lines Fix one of the tests: it relied on being present in an "output test" in order to actually test what it was supposed to test, i.e. that the code in the __del__ method did not crash. Use instead the new helper test_support.captured_output(). ................ r67041 \| benjamin.peterson \| 2008-10-29 21:33:00 +0100 (Wed, 29 Oct 2008) \| 1 line mention the version gettempdir() was added ................ r67044 \| amaury.forgeotdarc \| 2008-10-30 00:15:57 +0100 (Thu, 30 Oct 2008) \| 3 lines Correct error message in io.open(): closefd=True is the only accepted value with a file name. ................ r67070 \| benjamin.peterson \| 2008-10-31 21:41:44 +0100 (Fri, 31 Oct 2008) \| 1 line rephrase has_key doc ................ r67089 \| benjamin.peterson \| 2008-11-03 21:43:20 +0100 (Mon, 03 Nov 2008) \| 1 line clarify by splitting into multiple paragraphs ................ r67091 \| benjamin.peterson \| 2008-11-03 23:34:57 +0100 (Mon, 03 Nov 2008) \| 1 line move a FileIO test to test_fileio ................ r67101 \| georg.brandl \| 2008-11-04 21:49:35 +0100 (Tue, 04 Nov 2008) \| 2 lines #4167: fix markup glitches. ................ r67117 \| georg.brandl \| 2008-11-06 11:17:58 +0100 (Thu, 06 Nov 2008) \| 2 lines #4268: Use correct module for two toplevel functions. ................ r67118 \| georg.brandl \| 2008-11-06 11:19:11 +0100 (Thu, 06 Nov 2008) \| 2 lines #4267: small fixes in sqlite3 docs. ................ r67119 \| georg.brandl \| 2008-11-06 11:20:49 +0100 (Thu, 06 Nov 2008) \| 2 lines #4245: move Thread section to the top. ................ r67123 \| georg.brandl \| 2008-11-06 19:49:15 +0100 (Thu, 06 Nov 2008) \| 2 lines #4247: add "pass" examples to tutorial. ................ r67124 \| andrew.kuchling \| 2008-11-06 20:23:02 +0100 (Thu, 06 Nov 2008) \| 1 line Fix grammar error; reword two paragraphs ................	18 years ago
Benjamin Peterson	8e8c2152fb	Merged revisions 66938,66942 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r66938 \| benjamin.peterson \| 2008-10-16 16:27:54 -0500 (Thu, 16 Oct 2008) \| 1 line fix possible ref leak ........ r66942 \| benjamin.peterson \| 2008-10-16 16:48:06 -0500 (Thu, 16 Oct 2008) \| 1 line fix more possible ref leaks in _json and use Py_CLEAR ........	18 years ago
Benjamin Peterson	336680ecea	fix more possible ref leaks in _json and use Py_CLEAR	18 years ago
Benjamin Peterson	87e6ad290b	fix possible ref leak	18 years ago
Benjamin Peterson	a13d475901	merge r66932 and add a few py3k only checks	18 years ago
Benjamin Peterson	595e3cbb3d	check for error conditions in _json #3623	18 years ago
Antoine Pitrou	ee58fa484e	#3560 : cleanup C memoryview API	18 years ago
Martin v. Löwis	423be95dcf	Merged revisions 65654 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r65654 \| martin.v.loewis \| 2008-08-12 16:49:50 +0200 (Tue, 12 Aug 2008) \| 6 lines Issue #3139: Make buffer-interface thread-safe wrt. PyArg_ParseTuple, by denying s# to parse objects that have a releasebuffer procedure, and introducing s. More module might need to get converted to use s. ........	18 years ago
Benjamin Peterson	7af6eec6d0	Merged revisions 65147 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r65147 \| bob.ippolito \| 2008-07-19 16:59:50 -0500 (Sat, 19 Jul 2008) \| 1 line #3322: bounds checking for _json.scanstring ........	18 years ago
Bob Ippolito	d648f64a53	#3322 : bounds checking for _json.scanstring	18 years ago
Martin v. Löwis	1a21451b1d	Implement PEP 3121: new module initialization and finalization API.	18 years ago
Gregory P. Smith	dd96db63f6	This reverts r63675 based on the discussion in this thread: http://mail.python.org/pipermail/python-dev/2008-June/079988.html Python 2.6 should stick with PyString_* in its codebase. The PyBytes_* names in the spirit of 3.0 are available via a #define only. See the email thread.	18 years ago
Christian Heimes	72b710a596	Renamed PyString to PyBytes	18 years ago

27 Commits (6bcd00afa9dde18c1bbeb0a4d2fb376bac9dfd2c)