5 Commits

Author	SHA1	Message	Date
Benjamin Peterson	584f5cbf16	merge 3.3	2014-04-13 22:31:42 -04:00
Benjamin Peterson	156285c35f	merge 3.2	2014-04-13 22:28:16 -04:00
Ezio Melotti	566a2be95c	#18958: Improve error message for json.load(s) while passing a string that starts with a UTF-8 BOM.	2013-10-21 02:10:55 +03:00
Ezio Melotti	a0e768ccc2	#19307: Improve error message for json.load(s) while passing objects of the wrong type.	2013-10-21 01:52:33 +03:00
Ezio Melotti	66f2ea042a	#18273: move the tests in Lib/test/json_tests to Lib/test/test_json and make them discoverable by unittest. Patch by Zachary Ware.	2013-08-08 15:03:45 +03:00