summaryrefslogtreecommitdiff
path: root/pkg_resources/__init__.py
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2014-12-24 17:02:04 -0500
committerJason R. Coombs <jaraco@jaraco.com>2014-12-24 17:02:04 -0500
commit9063c163e105545bacb67865f5d35056eb342a49 (patch)
tree71e671da2fa531145f7ee4225e3efc138051c085 /pkg_resources/__init__.py
parent79a0c55d8c09d3fdd68157faa8658ecd85aa5d45 (diff)
downloadpython-setuptools-git-9063c163e105545bacb67865f5d35056eb342a49.tar.gz
Move vendored packaging module into pkg_resources._vendor, restoring independence of pkg_resources from setuptools. Fixes #311.
Diffstat (limited to 'pkg_resources/__init__.py')
-rw-r--r--pkg_resources/__init__.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 3a8edca5..699ac114 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -75,9 +75,9 @@ try:
except ImportError:
pass
-import setuptools._vendor.packaging.version
-import setuptools._vendor.packaging.specifiers
-packaging = setuptools._vendor.packaging
+import pkg_resources._vendor.packaging.version
+import pkg_resources._vendor.packaging.specifiers
+packaging = pkg_resources._vendor.packaging
class PEP440Warning(RuntimeWarning):