diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2020-09-04 10:22:54 -0400 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2020-09-04 10:22:54 -0400 |
| commit | fc4d9828768ceebd2f9337481450c88376c013e9 (patch) | |
| tree | 6dff622c50739ca19fdfbecf1008a42589d37b57 /setuptools/extern | |
| parent | 7bb73a477de24069002516eb6eb1d755bed9d65b (diff) | |
| parent | 03d36b9edb53e266a0b4b836e1e3178f989a0781 (diff) | |
| download | python-setuptools-git-feature/implicit-bootstrap.tar.gz | |
Merge branch 'master' into feature/implicit-bootstrapfeature/implicit-bootstrap
Diffstat (limited to 'setuptools/extern')
| -rw-r--r-- | setuptools/extern/__init__.py | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/setuptools/extern/__init__.py b/setuptools/extern/__init__.py index e8c616f9..b7f30dc2 100644 --- a/setuptools/extern/__init__.py +++ b/setuptools/extern/__init__.py @@ -43,13 +43,6 @@ class VendorImporter: __import__(extant) mod = sys.modules[extant] sys.modules[fullname] = mod - # mysterious hack: - # Remove the reference to the extant package/module - # 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, ): - del sys.modules[extant] return mod except ImportError: pass @@ -69,5 +62,5 @@ class VendorImporter: sys.meta_path.append(self) -names = 'six', 'packaging', 'pyparsing', 'ordered_set', +names = 'packaging', 'pyparsing', 'ordered_set', VendorImporter(__name__, names, 'setuptools._vendor').install() |