delta/cpython.git -

	Commit message (Collapse)	Author	Age	Files	Lines
*	#18273: move the tests in Lib/test/json_tests to Lib/test/test_json and make ↵	Ezio Melotti	2013-08-08	17	-980/+0
\| \| \| \|	them discoverable by unittest. Patch by Zachary Ware.
*	#17368: merge with 3.2.	Ezio Melotti	2013-03-13	2	-9/+21
\|\
\| *	#16549: merge with 3.2.	Ezio Melotti	2012-11-29	1	-2/+2
\| \|\
\| * \	#16476: merge with 3.2.	Ezio Melotti	2012-11-29	2	-9/+21
\| \|\ \
\| \| * \	#16549: merge with 3.2.	Ezio Melotti	2012-11-29	1	-0/+69
\| \| \|\ \
\| \| * \ \	#16559: merge with 3.2.	Ezio Melotti	2012-11-26	2	-9/+21
\| \| \|\ \ \
\| \| \| * \ \	Issue #16228: Fix a crash in the json module where a list changes size while ↵	Antoine Pitrou	2012-11-01	2	-9/+21
\| \| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	it is being encoded. Patch by Serhiy Storchaka.
\| \| \| \| * \ \	#15752: merge with 3.2.	Ezio Melotti	2012-08-21	2	-9/+21
\| \| \| \| \|\ \ \
\| \| \| \| \| * \ \	Issue #15615: Add some tests for the json module's handling of invalid input ↵	Antoine Pitrou	2012-08-18	2	-9/+21
\| \| \| \| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	data. Patch by Kushal Das.
\| \| \| \| \| \| * \| \|	Fix test failure	Antoine Pitrou	2011-10-04	1	-2/+2
\| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| * \| \|	Implement PEP 393.	Martin v. Löwis	2011-09-28	1	-8/+3
\| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| * \| \|	Issue #12778: Reduce memory consumption when JSON-encoding a large container ↵	Antoine Pitrou	2011-08-19	1	-1/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	of many small objects.
* \| \| \| \| \| \| \| \|	#17368: Fix an off-by-one error in the Python JSON decoder that caused a ↵	Ezio Melotti	2013-03-13	1	-4/+10
\| \|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	failure while decoding empty object literals when object_pairs_hook was specified.
* \| \| \| \| \| \| \|	#16549: fix test failures on Windows.	Ezio Melotti	2012-11-29	1	-2/+2
\|/ / / / / / /
* \| \| \| \| \| \|	#16476: Fix json.tool to avoid including trailing whitespace.	Ezio Melotti	2012-11-29	1	-8/+8
\| \|_\|_\|_\|_\|/ \|/\| \| \| \| \|
* \| \| \| \| \|	#16549: Make json.tool work again on Python 3 and add tests. Initial patch ↵	Ezio Melotti	2012-11-29	1	-0/+69
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	by Berker Peksag and Serhiy Storchaka.
* \| \| \| \|	#16559: Add more tests for the json module. Patch by Serhiy Storchaka.	Ezio Melotti	2012-11-26	3	-15/+44
\|/ / / /
* \| \| \|	Issue #16228: Fix a crash in the json module where a list changes size while ↵	Antoine Pitrou	2012-11-01	1	-0/+8
\|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	it is being encoded. Patch by Serhiy Storchaka.
* \| \|	#15752: s/assertRaisesRegexp/assertRaisesRegex/g	Ezio Melotti	2012-08-21	1	-2/+2
\|/ /
* \|	Issue #15615: Add some tests for the json module's handling of invalid input ↵	Antoine Pitrou	2012-08-18	1	-0/+9
\|/ \| \| \| \| \|	data. Patch by Kushal Das.
*	#5723: merge with 3.1.	Ezio Melotti	2011-05-14	16	-214/+247
\|
*	#12051: merge with 3.1.	Ezio Melotti	2011-05-11	1	-1/+20
\|
*	#12017: merge with 3.1.	Ezio Melotti	2011-05-07	1	-0/+12
\|
*	Merge with 3.1.	Ezio Melotti	2011-04-13	3	-6/+22
\|
*	Merge #10019: Fix regression relative to 2.6: add newlines if indent=0	R David Murray	2011-04-12	1	-0/+16
\| \| \| \|	Patch by Amaury Forgeot d'Arc, updated by Sando Tosi.
*	Issue #10572: Moved json tests to Lib/test/json_tests.	Alexander Belopolsky	2010-11-30	16	-0/+751
	Approved by Raymond Hettinger.