[Python-checkins] cpython (merge 3.5 -> default): Merge with 3.5

[zach.ware]

https://hg.python.org/cpython/rev/14f042958c32
changeset:   102949:14f042958c32
parent:      102947:dab6a7c34e1f
parent:      102948:ad9c2492556b
user:        Zachary Ware <zachary.ware at gmail.com>
date:        Tue Aug 30 02:12:43 2016 -0500
summary:
  Merge with 3.5

files:
  Makefile.pre.in |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Makefile.pre.in b/Makefile.pre.in
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -1202,7 +1202,7 @@
 		importlib test/test_importlib test/test_importlib/builtin \
 		test/test_importlib/extension test/test_importlib/frozen \
 		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 \
 		multiprocessing multiprocessing/dummy \
 		unittest unittest/test unittest/test/testmock \

-- 
Repository URL: https://hg.python.org/cpython