From 06872bb0bbbeb953e90bd0941444b0d499056557 Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" 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/__init__.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'setuptools/__init__.py') diff --git a/setuptools/__init__.py b/setuptools/__init__.py index fffcac76..6e1e5aa4 100644 --- a/setuptools/__init__.py +++ b/setuptools/__init__.py @@ -1,7 +1,5 @@ """Extensions to the 'distutils' for large or complex distributions""" -__import__('setuptools.bootstrap').bootstrap.ensure_deps() - import os import functools import distutils.core @@ -10,7 +8,12 @@ from distutils.core import Command as _Command from distutils.util import convert_path from fnmatch import fnmatchcase -from six.moves import filterfalse +try: + from setuptools._vendor.six.moves import filterfalse +except ImportError: + # fallback to naturally-installed version; allows system packagers to + # omit vendored packages. + from six.moves import filterfalse import setuptools.version from setuptools.extension import Extension -- cgit v1.2.1