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/command/test.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'setuptools/command/test.py')

diff --git a/setuptools/command/test.py b/setuptools/command/test.py
index 5f2e2299..32ff7f15 100644
--- a/setuptools/command/test.py
+++ b/setuptools/command/test.py
@@ -2,7 +2,12 @@ from distutils.errors import DistutilsOptionError
 from unittest import TestLoader
 import sys
 
-import six
+try:
+    from setuptools._vendor import six
+except ImportError:
+    # fallback to naturally-installed version; allows system packagers to
+    #  omit vendored packages.
+    import six
 
 from pkg_resources import (resource_listdir, resource_exists, normalize_path,
                            working_set, _namespace_packages,
-- 
cgit v1.2.3