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/command/bdist_egg.py | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

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

diff --git a/setuptools/command/bdist_egg.py b/setuptools/command/bdist_egg.py
index 78164819..9cebd7fa 100644
--- a/setuptools/command/bdist_egg.py
+++ b/setuptools/command/bdist_egg.py
@@ -11,12 +11,7 @@ import os
 import marshal
 import textwrap
 
-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 pkg_resources import get_build_platform, Distribution, ensure_directory
 from pkg_resources import EntryPoint
-- 
cgit v1.2.3