summaryrefslogtreecommitdiffstats
path: root/Lib/test/namespace_pkgs
diff options
context:
space:
mode:
authorEric V. Smith <eric@trueblade.com>2012-06-24 23:13:55 (GMT)
committerEric V. Smith <eric@trueblade.com>2012-06-24 23:13:55 (GMT)
commite51a36922ffcce8c5e45cc88dc95a9d33ead0f11 (patch)
tree77a4d11d13469e4aed6530c841252d98819ef198 /Lib/test/namespace_pkgs
parente6bdc8f2dd0d8cb495e61d08f1db9e0e19c03b1d (diff)
downloadcpython-e51a36922ffcce8c5e45cc88dc95a9d33ead0f11.zip
cpython-e51a36922ffcce8c5e45cc88dc95a9d33ead0f11.tar.gz
cpython-e51a36922ffcce8c5e45cc88dc95a9d33ead0f11.tar.bz2
Fixes issue 15039: namespace packages are no longer imported in preference to modules of the same name.
Diffstat (limited to 'Lib/test/namespace_pkgs')
-rw-r--r--Lib/test/namespace_pkgs/module_and_file/a_test.py1
-rw-r--r--Lib/test/namespace_pkgs/module_and_file/a_test/empty0
2 files changed, 1 insertions, 0 deletions
diff --git a/Lib/test/namespace_pkgs/module_and_file/a_test.py b/Lib/test/namespace_pkgs/module_and_file/a_test.py
new file mode 100644
index 0000000..43cbedb
--- /dev/null
+++ b/Lib/test/namespace_pkgs/module_and_file/a_test.py
@@ -0,0 +1 @@
+attr = 'in module'
diff --git a/Lib/test/namespace_pkgs/module_and_file/a_test/empty b/Lib/test/namespace_pkgs/module_and_file/a_test/empty
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/Lib/test/namespace_pkgs/module_and_file/a_test/empty