diff options
| -rw-r--r-- | Lib/test/namespace_pkgs/module_and_namespace_package/a_test.py (renamed from Lib/test/namespace_pkgs/module_and_file/a_test.py) | 0 | ||||
| -rw-r--r-- | Lib/test/namespace_pkgs/module_and_namespace_package/a_test/empty (renamed from Lib/test/namespace_pkgs/module_and_file/a_test/empty) | 0 | ||||
| -rw-r--r-- | Lib/test/test_namespace_pkgs.py | 6 | ||||
| -rw-r--r-- | Makefile.pre.in | 4 |
4 files changed, 6 insertions, 4 deletions
diff --git a/Lib/test/namespace_pkgs/module_and_file/a_test.py b/Lib/test/namespace_pkgs/module_and_namespace_package/a_test.py index 43cbedb..43cbedb 100644 --- a/Lib/test/namespace_pkgs/module_and_file/a_test.py +++ b/Lib/test/namespace_pkgs/module_and_namespace_package/a_test.py diff --git a/Lib/test/namespace_pkgs/module_and_file/a_test/empty b/Lib/test/namespace_pkgs/module_and_namespace_package/a_test/empty index e69de29..e69de29 100644 --- a/Lib/test/namespace_pkgs/module_and_file/a_test/empty +++ b/Lib/test/namespace_pkgs/module_and_namespace_package/a_test/empty diff --git a/Lib/test/test_namespace_pkgs.py b/Lib/test/test_namespace_pkgs.py index 7ad511f..6693d64 100644 --- a/Lib/test/test_namespace_pkgs.py +++ b/Lib/test/test_namespace_pkgs.py @@ -276,10 +276,12 @@ class ZipWithMissingDirectory(NamespacePackageTest): self.assertEqual(bar.two.attr, 'missing_directory foo two') -class ModuleAndFileInSameDir(NamespacePackageTest): - paths = ['module_and_file'] +class ModuleAndNamespacePackageInSameDir(NamespacePackageTest): + paths = ['module_and_namespace_package'] def test_module_before_namespace_package(self): + # Make sure we find the module in preference to the + # namespace package. import a_test self.assertEqual(a_test.attr, 'in module') diff --git a/Makefile.pre.in b/Makefile.pre.in index 916cb8e..bfa818b 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -991,8 +991,8 @@ LIBSUBDIRS= tkinter tkinter/test tkinter/test/test_tkinter \ test/namespace_pkgs/project3 \ test/namespace_pkgs/project3/parent \ test/namespace_pkgs/project3/parent/child \ - test/namespace_pkgs/module_and_file \ - test/namespace_pkgs/module_and_file/a_test \ + test/namespace_pkgs/module_and_namespace_package \ + test/namespace_pkgs/module_and_namespace_package/a_test \ collections concurrent concurrent/futures encodings \ email email/mime test/test_email test/test_email/data \ html json test/json_tests http dbm xmlrpc \ |