cpython.git - https://github.com/python/cpython.git

	Commit message (Expand)	Author	Age	Files	Lines
*	merge 3.3	Benjamin Peterson	2014-04-14	1	-0/+4
\|\
\| *	merge 3.2	Benjamin Peterson	2014-04-14	1	-0/+4

* \|	Issue #11489: JSON decoder now accepts lone surrogates.	Serhiy Storchaka	2013-11-26	1	-4/+47
\|\ \ \| \|/
\| *	Issue #11489: JSON decoder now accepts lone surrogates.	Serhiy Storchaka	2013-11-26	1	-4/+47

* \|	#18958: Improve error message for json.load(s) while passing a string that st...	Ezio Melotti	2013-10-20	1	-0/+14

* \|	#19307: Improve error message for json.load(s) while passing objects of the w...	Ezio Melotti	2013-10-20	1	-1/+8

* \|	Close #18745: Improve enum tests in test_json for infinities and NaN.	Ethan Furman	2013-09-02	1	-5/+44

* \|	Close #18264: int- and float-derived enums now converted to int or float.	Ethan Furman	2013-08-10	1	-0/+81

* \|	#18273: merge with 3.3.	Ezio Melotti	2013-08-08	2	-0/+93
\|/
*	#18273: move the tests in Lib/test/json_tests to Lib/test/test_json and make ...	Ezio Melotti	2013-08-08	18	-0/+975