diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2017-02-24 11:49:51 -0500 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2017-02-24 11:49:51 -0500 |
| commit | 3d0cc355fb5e8012cb8c72f0e25042a5a44f31d6 (patch) | |
| tree | 2286b3cd70544e0089f658e17ddb3fed4126b356 /pkg_resources/tests/test_resources.py | |
| parent | 4c560effc96a75f337193bc164ad4117b0e333ab (diff) | |
| download | python-setuptools-git-3d0cc355fb5e8012cb8c72f0e25042a5a44f31d6.tar.gz | |
Revert "Merge pull request #933 from pypa/feature/581-depend-not-bundle"
This reverts commit 089cdeb489a0fa94d11b7307b54210ef9aa40511, reversing
changes made to aaec654d804cb78dbb6391afff721a63f26a71cd.
Diffstat (limited to 'pkg_resources/tests/test_resources.py')
| -rw-r--r-- | pkg_resources/tests/test_resources.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg_resources/tests/test_resources.py b/pkg_resources/tests/test_resources.py index f28378b9..00ca7426 100644 --- a/pkg_resources/tests/test_resources.py +++ b/pkg_resources/tests/test_resources.py @@ -5,10 +5,10 @@ import sys import string import platform -from six.moves import map +from pkg_resources.extern.six.moves import map import pytest -import packaging +from pkg_resources.extern import packaging import pkg_resources from pkg_resources import (parse_requirements, VersionConflict, parse_version, |