Update vendoring technique to match that used for packaging. Ref #229.

--HG--
branch : feature/issue-229

1 files changed, 9 insertions, 2 deletions

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 30220b7f..de34ca27 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -16,8 +16,15 @@ import itertools
 import distutils.errors
 import io
 
-import six
-from six.moves import urllib
+try:
+    from setuptools._vendor import six
+    from setuptools._vendor.six.moves import urllib
+except ImportError:
+    # fallback to naturally-installed version; allows system packagers to
+    #  omit vendored packages.
+    import six
+    from six.moves import urllib
+
 import pytest
 try:
     from unittest import mock