From 952c1bafda1929c74c737646aa025e6ffad6632e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 31 Dec 2015 16:30:47 -0500
Subject: Modeling after Astropy's technique for bundling libraries, the
 imports are now much cleaner. Thanks @embray. Ref #229.

--HG--
branch : feature/issue-229
---
 setuptools/dist.py | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'setuptools/dist.py')

diff --git a/setuptools/dist.py b/setuptools/dist.py
index 11b42d19..70731225 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -13,12 +13,7 @@ from distutils.core import Distribution as _Distribution
 from distutils.errors import (DistutilsOptionError, DistutilsPlatformError,
     DistutilsSetupError)
 
-try:
-    from setuptools._vendor import six
-except ImportError:
-    # fallback to naturally-installed version; allows system packagers to
-    #  omit vendored packages.
-    import six
+from setuptools.extern import six
 
 from setuptools.depends import Require
 from setuptools import windows_support
-- 
cgit v1.2.3