From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Wed, 28 Mar 2018 06:43:51 +0000 (-0700)
Subject: bpo-32872: Avoid regrtest compatibility issue with namespace packages. (GH-6276)... 
X-Git-Tag: v3.6.5~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7f554c536cfe2e66a1ff0a36c8896040be1e5aee;p=python

bpo-32872: Avoid regrtest compatibility issue with namespace packages. (GH-6276) (GH-6278)

(cherry picked from commit e52ac045972a4f75d7f52e4ee0d6de128259134d)

Co-authored-by: Ned Deily <nad@python.org>
---

diff --git a/Lib/test/libregrtest/setup.py b/Lib/test/libregrtest/setup.py
index bf899a9e4d..910aca1b1a 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 0000000000..06d656bbfd
--- /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.