diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2017-02-24 11:49:51 -0500 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2017-02-24 11:49:51 -0500 |
| commit | 3d0cc355fb5e8012cb8c72f0e25042a5a44f31d6 (patch) | |
| tree | 2286b3cd70544e0089f658e17ddb3fed4126b356 /pkg_resources/__init__.py | |
| parent | 4c560effc96a75f337193bc164ad4117b0e333ab (diff) | |
| download | external_python_setuptools-3d0cc355fb5e8012cb8c72f0e25042a5a44f31d6.tar.gz external_python_setuptools-3d0cc355fb5e8012cb8c72f0e25042a5a44f31d6.tar.bz2 external_python_setuptools-3d0cc355fb5e8012cb8c72f0e25042a5a44f31d6.zip | |
Revert "Merge pull request #933 from pypa/feature/581-depend-not-bundle"
This reverts commit 089cdeb489a0fa94d11b7307b54210ef9aa40511, reversing
changes made to aaec654d804cb78dbb6391afff721a63f26a71cd.
Diffstat (limited to 'pkg_resources/__init__.py')
| -rw-r--r-- | pkg_resources/__init__.py | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py index 220a7ccc..2ed07c3d 100644 --- a/pkg_resources/__init__.py +++ b/pkg_resources/__init__.py @@ -45,8 +45,8 @@ except ImportError: # Python 3.2 compatibility import imp as _imp -import six -from six.moves import urllib, map, filter +from pkg_resources.extern import six +from pkg_resources.extern.six.moves import urllib, map, filter # capture these to bypass sandboxing from os import utime @@ -67,11 +67,12 @@ try: except ImportError: importlib_machinery = None -import packaging.version -import packaging.specifiers -import packaging.requirements -import packaging.markers -import appdirs +from pkg_resources.extern import appdirs +from pkg_resources.extern import packaging +__import__('pkg_resources.extern.packaging.version') +__import__('pkg_resources.extern.packaging.specifiers') +__import__('pkg_resources.extern.packaging.requirements') +__import__('pkg_resources.extern.packaging.markers') if (3, 0) < sys.version_info < (3, 3): raise RuntimeError("Python 3.3 or later is required") |