summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Snow <ericsnowcurrently@gmail.com>2014-03-29 21:57:44 (GMT)
committerEric Snow <ericsnowcurrently@gmail.com>2014-03-29 21:57:44 (GMT)
commitf269cc6b145b94436fd34deb3550c36dfb3f11b0 (patch)
tree08b0825c1a559da445dc0c3665153f03781b4811
parent1e1e601bd1eb9fc9fee5a1741f4429569bcc4f32 (diff)
downloadcpython-f269cc6b145b94436fd34deb3550c36dfb3f11b0.zip
cpython-f269cc6b145b94436fd34deb3550c36dfb3f11b0.tar.gz
cpython-f269cc6b145b94436fd34deb3550c36dfb3f11b0.tar.bz2
Issue #21097: Move test_namespace_pkgs into test_importlib.
-rw-r--r--Lib/test/test_importlib/namespace_pkgs/both_portions/foo/one.py (renamed from Lib/test/namespace_pkgs/both_portions/foo/one.py)0
-rw-r--r--Lib/test/test_importlib/namespace_pkgs/both_portions/foo/two.py (renamed from Lib/test/namespace_pkgs/both_portions/foo/two.py)0
-rw-r--r--Lib/test/test_importlib/namespace_pkgs/missing_directory.zip (renamed from Lib/test/namespace_pkgs/missing_directory.zip)bin515 -> 515 bytes
-rw-r--r--Lib/test/test_importlib/namespace_pkgs/module_and_namespace_package/a_test.py (renamed from Lib/test/namespace_pkgs/module_and_namespace_package/a_test.py)0
-rw-r--r--Lib/test/test_importlib/namespace_pkgs/module_and_namespace_package/a_test/empty (renamed from Lib/test/namespace_pkgs/module_and_namespace_package/a_test/empty)0
-rw-r--r--Lib/test/test_importlib/namespace_pkgs/nested_portion1.zip (renamed from Lib/test/namespace_pkgs/nested_portion1.zip)bin556 -> 556 bytes
-rw-r--r--Lib/test/test_importlib/namespace_pkgs/not_a_namespace_pkg/foo/__init__.py (renamed from Lib/test/namespace_pkgs/not_a_namespace_pkg/foo/__init__.py)0
-rw-r--r--Lib/test/test_importlib/namespace_pkgs/not_a_namespace_pkg/foo/one.py (renamed from Lib/test/namespace_pkgs/portion1/foo/one.py)0
-rw-r--r--Lib/test/test_importlib/namespace_pkgs/portion1/foo/one.py (renamed from Lib/test/namespace_pkgs/not_a_namespace_pkg/foo/one.py)0
-rw-r--r--Lib/test/test_importlib/namespace_pkgs/portion2/foo/two.py (renamed from Lib/test/namespace_pkgs/portion2/foo/two.py)0
-rw-r--r--Lib/test/test_importlib/namespace_pkgs/project1/parent/child/one.py (renamed from Lib/test/namespace_pkgs/project1/parent/child/one.py)0
-rw-r--r--Lib/test/test_importlib/namespace_pkgs/project2/parent/child/two.py (renamed from Lib/test/namespace_pkgs/project2/parent/child/two.py)0
-rw-r--r--Lib/test/test_importlib/namespace_pkgs/project3/parent/child/three.py (renamed from Lib/test/namespace_pkgs/project3/parent/child/three.py)0
-rw-r--r--Lib/test/test_importlib/namespace_pkgs/top_level_portion1.zip (renamed from Lib/test/namespace_pkgs/top_level_portion1.zip)bin332 -> 332 bytes
-rw-r--r--Lib/test/test_importlib/test_namespace_pkgs.py (renamed from Lib/test/test_namespace_pkgs.py)0
-rw-r--r--Misc/NEWS2
16 files changed, 2 insertions, 0 deletions
diff --git a/Lib/test/namespace_pkgs/both_portions/foo/one.py b/Lib/test/test_importlib/namespace_pkgs/both_portions/foo/one.py
index 3080f6f..3080f6f 100644
--- a/Lib/test/namespace_pkgs/both_portions/foo/one.py
+++ b/Lib/test/test_importlib/namespace_pkgs/both_portions/foo/one.py
diff --git a/Lib/test/namespace_pkgs/both_portions/foo/two.py b/Lib/test/test_importlib/namespace_pkgs/both_portions/foo/two.py
index 4131d3d..4131d3d 100644
--- a/Lib/test/namespace_pkgs/both_portions/foo/two.py
+++ b/Lib/test/test_importlib/namespace_pkgs/both_portions/foo/two.py
diff --git a/Lib/test/namespace_pkgs/missing_directory.zip b/Lib/test/test_importlib/namespace_pkgs/missing_directory.zip
index 836a910..836a910 100644
--- a/Lib/test/namespace_pkgs/missing_directory.zip
+++ b/Lib/test/test_importlib/namespace_pkgs/missing_directory.zip
Binary files differ
diff --git a/Lib/test/namespace_pkgs/module_and_namespace_package/a_test.py b/Lib/test/test_importlib/namespace_pkgs/module_and_namespace_package/a_test.py
index 43cbedb..43cbedb 100644
--- a/Lib/test/namespace_pkgs/module_and_namespace_package/a_test.py
+++ b/Lib/test/test_importlib/namespace_pkgs/module_and_namespace_package/a_test.py
diff --git a/Lib/test/namespace_pkgs/module_and_namespace_package/a_test/empty b/Lib/test/test_importlib/namespace_pkgs/module_and_namespace_package/a_test/empty
index e69de29..e69de29 100644
--- a/Lib/test/namespace_pkgs/module_and_namespace_package/a_test/empty
+++ b/Lib/test/test_importlib/namespace_pkgs/module_and_namespace_package/a_test/empty
diff --git a/Lib/test/namespace_pkgs/nested_portion1.zip b/Lib/test/test_importlib/namespace_pkgs/nested_portion1.zip
index 8d22406..8d22406 100644
--- a/Lib/test/namespace_pkgs/nested_portion1.zip
+++ b/Lib/test/test_importlib/namespace_pkgs/nested_portion1.zip
Binary files differ
diff --git a/Lib/test/namespace_pkgs/not_a_namespace_pkg/foo/__init__.py b/Lib/test/test_importlib/namespace_pkgs/not_a_namespace_pkg/foo/__init__.py
index e69de29..e69de29 100644
--- a/Lib/test/namespace_pkgs/not_a_namespace_pkg/foo/__init__.py
+++ b/Lib/test/test_importlib/namespace_pkgs/not_a_namespace_pkg/foo/__init__.py
diff --git a/Lib/test/namespace_pkgs/portion1/foo/one.py b/Lib/test/test_importlib/namespace_pkgs/not_a_namespace_pkg/foo/one.py
index d8f5c83..d8f5c83 100644
--- a/Lib/test/namespace_pkgs/portion1/foo/one.py
+++ b/Lib/test/test_importlib/namespace_pkgs/not_a_namespace_pkg/foo/one.py
diff --git a/Lib/test/namespace_pkgs/not_a_namespace_pkg/foo/one.py b/Lib/test/test_importlib/namespace_pkgs/portion1/foo/one.py
index d8f5c83..d8f5c83 100644
--- a/Lib/test/namespace_pkgs/not_a_namespace_pkg/foo/one.py
+++ b/Lib/test/test_importlib/namespace_pkgs/portion1/foo/one.py
diff --git a/Lib/test/namespace_pkgs/portion2/foo/two.py b/Lib/test/test_importlib/namespace_pkgs/portion2/foo/two.py
index d092e1e..d092e1e 100644
--- a/Lib/test/namespace_pkgs/portion2/foo/two.py
+++ b/Lib/test/test_importlib/namespace_pkgs/portion2/foo/two.py
diff --git a/Lib/test/namespace_pkgs/project1/parent/child/one.py b/Lib/test/test_importlib/namespace_pkgs/project1/parent/child/one.py
index 2776fcd..2776fcd 100644
--- a/Lib/test/namespace_pkgs/project1/parent/child/one.py
+++ b/Lib/test/test_importlib/namespace_pkgs/project1/parent/child/one.py
diff --git a/Lib/test/namespace_pkgs/project2/parent/child/two.py b/Lib/test/test_importlib/namespace_pkgs/project2/parent/child/two.py
index 8b037bc..8b037bc 100644
--- a/Lib/test/namespace_pkgs/project2/parent/child/two.py
+++ b/Lib/test/test_importlib/namespace_pkgs/project2/parent/child/two.py
diff --git a/Lib/test/namespace_pkgs/project3/parent/child/three.py b/Lib/test/test_importlib/namespace_pkgs/project3/parent/child/three.py
index f8abfe1..f8abfe1 100644
--- a/Lib/test/namespace_pkgs/project3/parent/child/three.py
+++ b/Lib/test/test_importlib/namespace_pkgs/project3/parent/child/three.py
diff --git a/Lib/test/namespace_pkgs/top_level_portion1.zip b/Lib/test/test_importlib/namespace_pkgs/top_level_portion1.zip
index 3b866c9..3b866c9 100644
--- a/Lib/test/namespace_pkgs/top_level_portion1.zip
+++ b/Lib/test/test_importlib/namespace_pkgs/top_level_portion1.zip
Binary files differ
diff --git a/Lib/test/test_namespace_pkgs.py b/Lib/test/test_importlib/test_namespace_pkgs.py
index 6639612..6639612 100644
--- a/Lib/test/test_namespace_pkgs.py
+++ b/Lib/test/test_importlib/test_namespace_pkgs.py
diff --git a/Misc/NEWS b/Misc/NEWS
index 38928f8..21bd779 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -122,6 +122,8 @@ Tests
- Issue #20743: Fix a reference leak in test_tcl.
+- Issue #21097: Move test_namespace_pkgs into test_importlib.
+
- Issue #20939: Avoid various network test failures due to new
redirect of http://www.python.org/ to https://www.python.org:
use http://www.example.com instead.