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/tests/test_resources.py | |
| parent | 79a0c55d8c09d3fdd68157faa8658ecd85aa5d45 (diff) | |
| download | python-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 'setuptools/tests/test_resources.py')
| -rw-r--r-- | setuptools/tests/test_resources.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/setuptools/tests/test_resources.py b/setuptools/tests/test_resources.py index 1902fb2c..7cf2385b 100644 --- a/setuptools/tests/test_resources.py +++ b/setuptools/tests/test_resources.py @@ -8,9 +8,9 @@ import tempfile import shutil from unittest import TestCase -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 import pkg_resources from pkg_resources import (parse_requirements, VersionConflict, parse_version, |