diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2014-12-24 17:11:49 -0500 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2014-12-24 17:11:49 -0500 |
| commit | 170657b68f4b92e7e1bf82f5e19a831f5744af67 (patch) | |
| tree | 052875ac1190391aaae80ad7ba6f5a1bebeb3828 /setuptools/tests/test_resources.py | |
| parent | 9063c163e105545bacb67865f5d35056eb342a49 (diff) | |
| download | external_python_setuptools-170657b68f4b92e7e1bf82f5e19a831f5744af67.tar.gz external_python_setuptools-170657b68f4b92e7e1bf82f5e19a831f5744af67.tar.bz2 external_python_setuptools-170657b68f4b92e7e1bf82f5e19a831f5744af67.zip | |
Setuptools now uses the 'packaging' package from pkg_resources, unifying the behavior around resolution of that package.
Diffstat (limited to 'setuptools/tests/test_resources.py')
| -rw-r--r-- | setuptools/tests/test_resources.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/setuptools/tests/test_resources.py b/setuptools/tests/test_resources.py index 7cf2385b..f9f2e459 100644 --- a/setuptools/tests/test_resources.py +++ b/setuptools/tests/test_resources.py @@ -8,15 +8,13 @@ import tempfile import shutil from unittest import TestCase -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, Distribution, EntryPoint, Requirement, safe_version, safe_name, WorkingSet) +packaging = pkg_resources.packaging + from setuptools.command.easy_install import (get_script_header, is_sh, nt_quote_arg) from setuptools.compat import StringIO, iteritems, PY3 |