aboutsummaryrefslogtreecommitdiffstats
path: root/pkg_resources/__init__.py
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2017-01-23 10:32:22 -0500
committerGitHub <noreply@github.com>2017-01-23 10:32:22 -0500
commit089cdeb489a0fa94d11b7307b54210ef9aa40511 (patch)
treeee738b703f1b0737e139b5d10f62e54bd20e1028 /pkg_resources/__init__.py
parentaaec654d804cb78dbb6391afff721a63f26a71cd (diff)
parent11676d39c405672270a543bdc32de395b935b869 (diff)
downloadexternal_python_setuptools-089cdeb489a0fa94d11b7307b54210ef9aa40511.tar.gz
external_python_setuptools-089cdeb489a0fa94d11b7307b54210ef9aa40511.tar.bz2
external_python_setuptools-089cdeb489a0fa94d11b7307b54210ef9aa40511.zip
Merge pull request #933 from pypa/feature/581-depend-not-bundle
Bundle dependencies instead of vendoring them
Diffstat (limited to 'pkg_resources/__init__.py')
-rw-r--r--pkg_resources/__init__.py15
1 files changed, 7 insertions, 8 deletions
diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 4c9868c7..55c91595 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
-from pkg_resources.extern import six
-from pkg_resources.extern.six.moves import urllib, map, filter
+import six
+from six.moves import urllib, map, filter
# capture these to bypass sandboxing
from os import utime
@@ -67,12 +67,11 @@ try:
except ImportError:
importlib_machinery = None
-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')
+import packaging.version
+import packaging.specifiers
+import packaging.requirements
+import packaging.markers
+import appdirs
if (3, 0) < sys.version_info < (3, 3):
raise RuntimeError("Python 3.3 or later is required")