summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNed Deily <nad@python.org>2018-03-28 05:57:13 (GMT)
committerGitHub <noreply@github.com>2018-03-28 05:57:13 (GMT)
commite52ac045972a4f75d7f52e4ee0d6de128259134d (patch)
tree7751f39de6289036a223a3f7f67f275d6a4d1057
parent65a34709f60711f7c46031d4c6c420f567bc790a (diff)
downloadcpython-e52ac045972a4f75d7f52e4ee0d6de128259134d.zip
cpython-e52ac045972a4f75d7f52e4ee0d6de128259134d.tar.gz
cpython-e52ac045972a4f75d7f52e4ee0d6de128259134d.tar.bz2
bpo-32872: Avoid regrtest compatibility issue with namespace packages. (GH-6276)
-rw-r--r--Lib/test/libregrtest/setup.py2
-rw-r--r--Misc/NEWS.d/next/Tests/2018-03-28-01-35-02.bpo-32872.J5NDUj.rst1
2 files changed, 2 insertions, 1 deletions
diff --git a/Lib/test/libregrtest/setup.py b/Lib/test/libregrtest/setup.py
index bf899a9..910aca1 100644
--- a/Lib/test/libregrtest/setup.py
+++ b/Lib/test/libregrtest/setup.py
@@ -57,7 +57,7 @@ def setup_tests(ns):
if hasattr(module, '__path__'):
for index, path in enumerate(module.__path__):
module.__path__[index] = os.path.abspath(path)
- if hasattr(module, '__file__'):
+ if getattr(module, '__file__', None):
module.__file__ = os.path.abspath(module.__file__)
# MacOSX (a.k.a. Darwin) has a default stack size that is too small
diff --git a/Misc/NEWS.d/next/Tests/2018-03-28-01-35-02.bpo-32872.J5NDUj.rst b/Misc/NEWS.d/next/Tests/2018-03-28-01-35-02.bpo-32872.J5NDUj.rst
new file mode 100644
index 0000000..06d656b
--- /dev/null
+++ b/Misc/NEWS.d/next/Tests/2018-03-28-01-35-02.bpo-32872.J5NDUj.rst
@@ -0,0 +1 @@
+Avoid regrtest compatibility issue with namespace packages.