diff --git a/pytest_doctestplus/plugin.py b/pytest_doctestplus/plugin.py index 2deaec5..65422c6 100644 --- a/pytest_doctestplus/plugin.py +++ b/pytest_doctestplus/plugin.py @@ -259,34 +259,22 @@ def collect(self): if filepath in ("setup.py", "__main__.py"): return - elif filepath == "conftest.py": + try: + if PYTEST_GT_5: + from _pytest.pathlib import import_path + mode = self.config.getoption("importmode") + if PYTEST_GE_7_0: - module = self.config.pluginmanager._importconftest( - self.path, self.config.getoption("importmode"), - rootpath=self.config.rootpath) + module = import_path(fspath, mode=mode, root=self.config.rootpath) elif PYTEST_GT_5: - module = self.config.pluginmanager._importconftest( - self.fspath, self.config.getoption("importmode")) + module = import_path(fspath, mode=mode) else: - module = self.config.pluginmanager._importconftest( - self.fspath) - else: - try: - if PYTEST_GT_5: - from _pytest.pathlib import import_path - mode = self.config.getoption("importmode") - - if PYTEST_GE_7_0: - module = import_path(fspath, mode=mode, root=self.config.rootpath) - elif PYTEST_GT_5: - module = import_path(fspath, mode=mode) - else: - module = fspath.pyimport() - except ImportError: - if self.config.getvalue("doctest_ignore_import_errors"): - pytest.skip("unable to import module %r" % fspath) - else: - raise + module = fspath.pyimport() + except ImportError: + if self.config.getvalue("doctest_ignore_import_errors"): + pytest.skip("unable to import module %r" % fspath) + else: + raise options = get_optionflags(self) | FIX