diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2014-12-24 17:02:04 -0500 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2014-12-24 17:02:04 -0500 |
| commit | 9063c163e105545bacb67865f5d35056eb342a49 (patch) | |
| tree | 71e671da2fa531145f7ee4225e3efc138051c085 /setuptools/dist.py | |
| parent | 79a0c55d8c09d3fdd68157faa8658ecd85aa5d45 (diff) | |
| download | external_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/dist.py')
| -rw-r--r-- | setuptools/dist.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/setuptools/dist.py b/setuptools/dist.py index e44796fd..2daa2835 100644 --- a/setuptools/dist.py +++ b/setuptools/dist.py @@ -17,8 +17,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.depends import Require from setuptools.compat import basestring, PY2 |