aboutsummaryrefslogtreecommitdiffstats
path: root/setuptools/command/egg_info.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 /setuptools/command/egg_info.py
parent79a0c55d8c09d3fdd68157faa8658ecd85aa5d45 (diff)
downloadexternal_python_setuptools-9063c163e105545bacb67865f5d35056eb342a49.tar.gz
external_python_setuptools-9063c163e105545bacb67865f5d35056eb342a49.tar.bz2
external_python_setuptools-9063c163e105545bacb67865f5d35056eb342a49.zip
Move vendored packaging module into pkg_resources._vendor, restoring independence of pkg_resources from setuptools. Fixes #311.
Diffstat (limited to 'setuptools/command/egg_info.py')
-rwxr-xr-xsetuptools/command/egg_info.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index e1324127..dfbab0e9 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -15,8 +15,8 @@ try:
import packaging.version
except ImportError:
# fallback to vendored version
- import setuptools._vendor.packaging.version
- packaging = setuptools._vendor.packaging
+ import pkg_resources._vendor.packaging.version
+ packaging = pkg_resources._vendor.packaging
from setuptools import Command
from setuptools.command.sdist import sdist