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

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

diff --git a/setuptools/command/setopt.py b/setuptools/command/setopt.py
index f78e0cd5..1441e512 100755
--- a/setuptools/command/setopt.py
+++ b/setuptools/command/setopt.py
@@ -4,7 +4,12 @@ from distutils.errors import DistutilsOptionError
 import distutils
 import os
 
-from six.moves import configparser
+try:
+    from setuptools._vendor.six.moves import configparser
+except ImportError:
+    # fallback to naturally-installed version; allows system packagers to
+    #  omit vendored packages.
+    from six.moves import configparser
 
 from setuptools import Command
 
-- 
cgit v1.2.1