summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNed Deily <nad@acm.org>2014-04-09 01:57:10 (GMT)
committerNed Deily <nad@acm.org>2014-04-09 01:57:10 (GMT)
commit163962f1193350f2e783cc05b9f666ecb7e46112 (patch)
treedc1d8490781bb0e092e3bab240c5ba78f1cbb4ca
parentd5ed2c1cd2ff9e8d8d0c387506adef5340cfd2f0 (diff)
parent490e53b853c314bf05f369bdab66db0b4701d837 (diff)
downloadcpython-163962f1193350f2e783cc05b9f666ecb7e46112.zip
cpython-163962f1193350f2e783cc05b9f666ecb7e46112.tar.gz
cpython-163962f1193350f2e783cc05b9f666ecb7e46112.tar.bz2
Issue #21097: merge from 3.4
-rw-r--r--Makefile.pre.in40
1 files changed, 20 insertions, 20 deletions
diff --git a/Makefile.pre.in b/Makefile.pre.in
index bd79fb3..5af61e3 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -1119,26 +1119,26 @@ LIBSUBDIRS= tkinter tkinter/test tkinter/test/test_tkinter \
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 \