aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2018-07-09 00:07:40 -0400
committerJason R. Coombs <jaraco@jaraco.com>2018-07-09 00:07:40 -0400
commit949bd166692af0694631542b02e3a2f26a48b455 (patch)
treed6080a43fbf2ab94d400f153cf1f01591c597e6f
parente1fb17476770620546d0bd244b35591b99ba6ea7 (diff)
downloadexternal_python_setuptools-949bd166692af0694631542b02e3a2f26a48b455.tar.gz
external_python_setuptools-949bd166692af0694631542b02e3a2f26a48b455.tar.bz2
external_python_setuptools-949bd166692af0694631542b02e3a2f26a48b455.zip
Avoid removing packages imported from the root. Fixes #1383.
-rw-r--r--changelog.d/1383.change1
-rw-r--r--pkg_resources/extern/__init__.py2
2 files changed, 2 insertions, 1 deletions
diff --git a/changelog.d/1383.change b/changelog.d/1383.change
new file mode 100644
index 00000000..dc8b839b
--- /dev/null
+++ b/changelog.d/1383.change
@@ -0,0 +1 @@
+In pkg_resources VendorImporter, avoid removing packages imported from the root.
diff --git a/pkg_resources/extern/__init__.py b/pkg_resources/extern/__init__.py
index b4156fec..c1eb9e99 100644
--- a/pkg_resources/extern/__init__.py
+++ b/pkg_resources/extern/__init__.py
@@ -48,7 +48,7 @@ class VendorImporter:
# on later Python versions to cause relative imports
# in the vendor package to resolve the same modules
# as those going through this importer.
- if sys.version_info > (3, 3):
+ if prefix and sys.version_info > (3, 3):
del sys.modules[extant]
return mod
except ImportError: