diff --git a/changelog/8503.trivial.rst b/changelog/8503.trivial.rst new file mode 100644 index 00000000000..26f660bbf3f --- /dev/null +++ b/changelog/8503.trivial.rst @@ -0,0 +1,4 @@ +:meth:`pytest.MonkeyPatch.syspath_prepend` no longer fails when +``setuptools`` is not installed. +It now only calls :func:`pkg_resources.fixup_namespace_packages` if +``pkg_resources`` was previously imported, because it is not needed otherwise. diff --git a/src/_pytest/monkeypatch.py b/src/_pytest/monkeypatch.py index 2c432065625..708b25aa073 100644 --- a/src/_pytest/monkeypatch.py +++ b/src/_pytest/monkeypatch.py @@ -312,14 +312,17 @@ def delenv(self, name: str, raising: bool = True) -> None: def syspath_prepend(self, path) -> None: """Prepend ``path`` to ``sys.path`` list of import locations.""" - from pkg_resources import fixup_namespace_packages if self._savesyspath is None: self._savesyspath = sys.path[:] sys.path.insert(0, str(path)) # https://github.com/pypa/setuptools/blob/d8b901bc/docs/pkg_resources.txt#L162-L171 - fixup_namespace_packages(str(path)) + # this is only needed when pkg_resources was already loaded by the namespace package + if "pkg_resources" in sys.modules: + from pkg_resources import fixup_namespace_packages + + fixup_namespace_packages(str(path)) # A call to syspathinsert() usually means that the caller wants to # import some dynamically created files, thus with python3 we