diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2015-12-31 11:51:01 -0500 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2015-12-31 11:51:01 -0500 |
| commit | 06872bb0bbbeb953e90bd0941444b0d499056557 (patch) | |
| tree | 73adc719c4acd99095181f0ccd42bbc7564ef8f0 /setuptools/tests/test_integration.py | |
| parent | 29fa01621c3de0a5c78c4f49b5d051386d0d566f (diff) | |
| download | external_python_setuptools-06872bb0bbbeb953e90bd0941444b0d499056557.tar.gz external_python_setuptools-06872bb0bbbeb953e90bd0941444b0d499056557.tar.bz2 external_python_setuptools-06872bb0bbbeb953e90bd0941444b0d499056557.zip | |
Update vendoring technique to match that used for packaging. Ref #229.
--HG--
branch : feature/issue-229
Diffstat (limited to 'setuptools/tests/test_integration.py')
| -rw-r--r-- | setuptools/tests/test_integration.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/setuptools/tests/test_integration.py b/setuptools/tests/test_integration.py index 11a6ff5a..1c574020 100644 --- a/setuptools/tests/test_integration.py +++ b/setuptools/tests/test_integration.py @@ -7,7 +7,13 @@ import glob import os import sys -from six.moves import urllib +try: + from setuptools._vendor.six.moves import urllib +except ImportError: + # fallback to naturally-installed version; allows system packagers to + # omit vendored packages. + from six.moves import urllib + import pytest |