diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2013-12-01 05:33:34 -0500 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2013-12-01 05:33:34 -0500 |
| commit | 4e2c005f8702ed7e2bce31425748eb83f3e9db0f (patch) | |
| tree | eb4393d8b49efde30acd60bbd21d1d74d3c6eba5 | |
| parent | 7e656969999482e4a51aabe16e8200180270e4f8 (diff) | |
| download | external_python_setuptools-4e2c005f8702ed7e2bce31425748eb83f3e9db0f.tar.gz external_python_setuptools-4e2c005f8702ed7e2bce31425748eb83f3e9db0f.tar.bz2 external_python_setuptools-4e2c005f8702ed7e2bce31425748eb83f3e9db0f.zip | |
Use pkgutil namespace. Still export get_importer as it's referenced in __all__.
--HG--
extra : amend_source : fe3ad40ffbb67cc7f3407a37ac42671ea3ecb983
| -rw-r--r-- | CHANGES.txt | 2 | ||||
| -rw-r--r-- | pkg_resources.py | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index 2736d4c1..d28b07be 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -11,6 +11,8 @@ CHANGES * Removed ``setuptools.command.easy_install.HAS_USER_SITE``. Clients expecting this boolean variable should use ``site.ENABLE_USER_SITE`` instead. +* Removed ``pkg_resources.ImpWrapper``. Clients that expected this class + should use ``pkgutil.ImpImporter`` instead. ----- 1.4.1 diff --git a/pkg_resources.py b/pkg_resources.py index 828f9443..36a7b306 100644 --- a/pkg_resources.py +++ b/pkg_resources.py @@ -23,7 +23,8 @@ import zipimport import warnings import stat import functools -from pkgutil import get_importer, ImpImporter as ImpWrapper +import pkgutil +from pkgutil import get_importer try: from urlparse import urlparse, urlunparse @@ -1778,7 +1779,7 @@ def find_on_path(importer, path_item, only=False): for item in find_distributions(os.path.join(path_item,line.rstrip())): yield item break -register_finder(ImpWrapper,find_on_path) +register_finder(pkgutil.ImpImporter,find_on_path) if importlib_bootstrap is not None: register_finder(importlib_bootstrap.FileFinder, find_on_path) @@ -1882,7 +1883,7 @@ def file_ns_handler(importer, path_item, packageName, module): # Only return the path if it's not already there return subpath -register_namespace_handler(ImpWrapper,file_ns_handler) +register_namespace_handler(pkgutil.ImpImporter,file_ns_handler) register_namespace_handler(zipimport.zipimporter,file_ns_handler) if importlib_bootstrap is not None: |