8 Commits

Author	SHA1	Message	Date
Benjamin Peterson	0b2a6dc42b	merge 3.4	2015-02-02 17:47:31 -05:00
Benjamin Peterson	1572944499	reduce memory usage of test (closes #23369)	2015-02-02 17:47:07 -05:00
Benjamin Peterson	83e814d852	merge 3.4	2015-02-01 18:02:21 -05:00
Benjamin Peterson	68389eaa3f	remove extra ws	2015-02-01 18:02:09 -05:00
Benjamin Peterson	71cf91cc09	merge 3.4 (#23369)	2015-02-01 18:00:19 -05:00
Benjamin Peterson	e3bfe19358	fix possible overflow in encode_basestring_ascii (closes #23369)	2015-02-01 17:53:53 -05:00
Antoine Pitrou	dc3eaa80d4	Issue #23206: Make ``json.dumps(..., ensure_ascii=False)`` as fast as the default case of ``ensure_ascii=True``. Patch by Naoki Inada.	2015-01-11 16:41:01 +01: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