[Python-checkins] cpython (merge 3.4 -> default): Issue #21097: merge from 3.4

[ned.deily]

http://hg.python.org/cpython/rev/7aae2b9fcfad
changeset:   90193:7aae2b9fcfad
parent:      90191:7d004ad09bf5
parent:      90192:99265d30fa38
user:        Ned Deily <nad at acm.org>
date:        Tue Apr 08 18:57:10 2014 -0700
summary:
  Issue #21097: merge from 3.4

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


diff --git a/Makefile.pre.in b/Makefile.pre.in
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -1119,26 +1119,26 @@
 		test/imghdrdata \
 		test/subprocessdata test/sndhdrdata test/support \
 		test/tracedmodules test/encoded_modules \
-		test/namespace_pkgs \
-		test/namespace_pkgs/both_portions \
-		test/namespace_pkgs/both_portions/foo \
-		test/namespace_pkgs/not_a_namespace_pkg \
-		test/namespace_pkgs/not_a_namespace_pkg/foo \
-		test/namespace_pkgs/portion1 \
-		test/namespace_pkgs/portion1/foo \
-		test/namespace_pkgs/portion2 \
-		test/namespace_pkgs/portion2/foo \
-		test/namespace_pkgs/project1 \
-		test/namespace_pkgs/project1/parent \
-		test/namespace_pkgs/project1/parent/child \
-		test/namespace_pkgs/project2 \
-		test/namespace_pkgs/project2/parent \
-		test/namespace_pkgs/project2/parent/child \
-		test/namespace_pkgs/project3 \
-		test/namespace_pkgs/project3/parent \
-		test/namespace_pkgs/project3/parent/child \
-                test/namespace_pkgs/module_and_namespace_package \
-                test/namespace_pkgs/module_and_namespace_package/a_test \
+		test/test_importlib/namespace_pkgs \
+		test/test_importlib/namespace_pkgs/both_portions \
+		test/test_importlib/namespace_pkgs/both_portions/foo \
+		test/test_importlib/namespace_pkgs/not_a_namespace_pkg \
+		test/test_importlib/namespace_pkgs/not_a_namespace_pkg/foo \
+		test/test_importlib/namespace_pkgs/portion1 \
+		test/test_importlib/namespace_pkgs/portion1/foo \
+		test/test_importlib/namespace_pkgs/portion2 \
+		test/test_importlib/namespace_pkgs/portion2/foo \
+		test/test_importlib/namespace_pkgs/project1 \
+		test/test_importlib/namespace_pkgs/project1/parent \
+		test/test_importlib/namespace_pkgs/project1/parent/child \
+		test/test_importlib/namespace_pkgs/project2 \
+		test/test_importlib/namespace_pkgs/project2/parent \
+		test/test_importlib/namespace_pkgs/project2/parent/child \
+		test/test_importlib/namespace_pkgs/project3 \
+		test/test_importlib/namespace_pkgs/project3/parent \
+		test/test_importlib/namespace_pkgs/project3/parent/child \
+                test/test_importlib/namespace_pkgs/module_and_namespace_package \
+                test/test_importlib/namespace_pkgs/module_and_namespace_package/a_test \
 		asyncio \
 		test/test_asyncio \
 		collections concurrent concurrent/futures encodings \

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