]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
bpo-36406: Handle namespace packages in doctest (GH-12520) (GH-17592)
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Fri, 13 Dec 2019 23:30:04 +0000 (15:30 -0800)
committerBrett Cannon <54418+brettcannon@users.noreply.github.com>
Fri, 13 Dec 2019 23:30:04 +0000 (15:30 -0800)
(cherry picked from commit 8289e27393395ee903bd096d42e07c112d7f15c6)

Co-authored-by: Xtreak <tir.karthi@gmail.com>
Lib/doctest.py
Lib/test/test_doctest.py
Misc/NEWS.d/next/Library/2019-03-24-12-12-27.bpo-36406.mCEkOl.rst [new file with mode: 0644]

index 79d91a040c2eeeff533f100f8342ac2ed7b71d9a..2a4b8c7dae01221ae54e31173729f304dde904d2 100644 (file)
@@ -1059,7 +1059,8 @@ class DocTestFinder:
         if module is None:
             filename = None
         else:
-            filename = getattr(module, '__file__', module.__name__)
+            # __file__ can be None for namespace packages.
+            filename = getattr(module, '__file__', None) or module.__name__
             if filename[-4:] == ".pyc":
                 filename = filename[:-1]
         return self._parser.get_doctest(docstring, globs, name,
index 4a3c488738d39f40da337a669f28fd40e8681448..5f891c50d8fcaf07b1b34275ea60c84be875428a 100644 (file)
@@ -697,8 +697,12 @@ class TestDocTestFinder(unittest.TestCase):
             finally:
                 support.forget(pkg_name)
                 sys.path.pop()
-            assert doctest.DocTestFinder().find(mod) == []
 
+            include_empty_finder = doctest.DocTestFinder(exclude_empty=False)
+            exclude_empty_finder = doctest.DocTestFinder(exclude_empty=True)
+
+            self.assertEqual(len(include_empty_finder.find(mod)), 1)
+            self.assertEqual(len(exclude_empty_finder.find(mod)), 0)
 
 def test_DocTestParser(): r"""
 Unit tests for the `DocTestParser` class.
diff --git a/Misc/NEWS.d/next/Library/2019-03-24-12-12-27.bpo-36406.mCEkOl.rst b/Misc/NEWS.d/next/Library/2019-03-24-12-12-27.bpo-36406.mCEkOl.rst
new file mode 100644 (file)
index 0000000..3d81eb5
--- /dev/null
@@ -0,0 +1 @@
+Handle namespace packages in :mod:`doctest`. Patch by Karthikeyan Singaravelan.