Trying a new technique. In this approach, setuptools is aware of its dependencies and when imported makes sure the vendored versions are present on sys.path.

3 files changed, 29 insertions, 0 deletions

diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index 920dad38..c885555d 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -1,5 +1,7 @@
 """Extensions to the 'distutils' for large or complex distributions"""
 
+__import__('setuptools.bootstrap').bootstrap.ensure_deps()
+
 import os
 import sys
 import distutils.core
diff --git a/setuptools/_vendor/six-1.7.3.egg b/setuptools/_vendor/six-1.7.3.egg
new file mode 100644
index 00000000..fe3e82c6
--- /dev/null
+++ b/setuptools/_vendor/six-1.7.3.egg
diff --git a/setuptools/bootstrap.py b/setuptools/bootstrap.py
new file mode 100644
index 00000000..0cd95778
--- /dev/null
+++ b/setuptools/bootstrap.py
@@ -0,0 +1,27 @@
+"""
+When setuptools is installed in a clean environment, it doesn't have its
+dependencies, so it can't run to install its dependencies. This module
+checks those dependencies and if one or more are missing, it uses vendored
+versions.
+"""
+
+import os
+import sys
+import glob
+
+def ensure_deps():
+	"""
+	Detect if dependencies are installed and if not, use vendored versions.
+	"""
+	try:
+		__import__('six')
+	except ImportError:
+		use_vendor_deps()
+
+def use_vendor_deps():
+	"""
+	Use vendored versions
+	"""
+	here = os.path.dirname(__file__)
+	eggs = glob.glob(here + '/_vendor/*.egg')
+	sys.path.extend(eggs)