summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--astroid/interpreter/_import/util.py6
-rw-r--r--setup.cfg1
3 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 20db3f11..530c8f30 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -29,6 +29,8 @@ Release date: TBA
Closes PyCQA/pylint#4715
+* Add dependency on setuptools and a guard to prevent related exceptions.
+
What's New in astroid 2.6.2?
============================
diff --git a/astroid/interpreter/_import/util.py b/astroid/interpreter/_import/util.py
index a917bd3d..eff54c3e 100644
--- a/astroid/interpreter/_import/util.py
+++ b/astroid/interpreter/_import/util.py
@@ -7,4 +7,8 @@ except ImportError:
def is_namespace(modname):
- return pkg_resources is not None and modname in pkg_resources._namespace_packages
+ return (
+ pkg_resources is not None
+ and hasattr(pkg_resources, "_namespace_packages")
+ and modname in pkg_resources._namespace_packages
+ )
diff --git a/setup.cfg b/setup.cfg
index bc464c55..88ca5664 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -38,6 +38,7 @@ packages = find:
install_requires =
lazy_object_proxy>=1.4.0
wrapt>=1.11,<1.13
+ setuptools>=56.0
typed-ast>=1.4.0,<1.5;implementation_name=="cpython" and python_version<"3.8"
typing-extensions>=3.7.4;python_version<"3.8"
python_requires = ~=3.6