From 06872bb0bbbeb953e90bd0941444b0d499056557 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 31 Dec 2015 11:51:01 -0500
Subject: Update vendoring technique to match that used for packaging. Ref
 #229.

--HG--
branch : feature/issue-229
---
 setuptools/tests/test_easy_install.py | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'setuptools/tests/test_easy_install.py')

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
-- 
cgit v1.2.1