Merge with 3.5

This commit is contained in:
Zachary Ware 2016-08-30 02:12:43 -05:00
commit a582af8a5c

View file

@ -1202,7 +1202,7 @@ LIBSUBDIRS= tkinter tkinter/test tkinter/test/test_tkinter \
importlib test/test_importlib test/test_importlib/builtin \ importlib test/test_importlib test/test_importlib/builtin \
test/test_importlib/extension test/test_importlib/frozen \ test/test_importlib/extension test/test_importlib/frozen \
test/test_importlib/import_ test/test_importlib/source \ test/test_importlib/import_ test/test_importlib/source \
test/test_tools test/test_warnings \ test/test_tools test/test_warnings test/test_warnings/data \
turtledemo \ turtledemo \
multiprocessing multiprocessing/dummy \ multiprocessing multiprocessing/dummy \
unittest unittest/test unittest/test/testmock \ unittest unittest/test unittest/test/testmock \