3 Commits

Author	SHA1	Message	Date
Ethan Furman	a4998a7041	Close #18264: int- and float-derived enums now converted to int or float.	2013-08-10 13:01:45 -07:00
Ezio Melotti	5cc06fde43	#18273: merge with 3.3.	2013-08-08 15:18:26 +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