From: Zooko O'Whielacronx <zooko@zooko.com>
Date: Fri, 9 Nov 2007 21:58:03 +0000 (-0700)
Subject: setup: continue running setup.py even if ez_setup.py can't be imported
X-Git-Tag: allmydata-tahoe-0.7.0~231
X-Git-Url: https://git.rkrishnan.org/components/%22news.html/?a=commitdiff_plain;h=9a40ef7526021d9573bf234bb1a7be17afa9179a;p=tahoe-lafs%2Ftahoe-lafs.git

setup: continue running setup.py even if ez_setup.py can't be imported
---

diff --git a/setup.py b/setup.py
index e40f5446..ea4b0172 100644
--- a/setup.py
+++ b/setup.py
@@ -20,16 +20,19 @@
 # Inc., please contact partnerships@allmydata.com and visit
 # http://allmydata.com/.
 
-from ez_setup import use_setuptools
-import sys
-if 'cygwin' in sys.platform.lower():
-    min_version='0.6c6'
+import sys, re, os.path
+try:
+    from ez_setup import use_setuptools
+except ImportError:
+    pass
 else:
-    min_version='0.6a9'
-use_setuptools(min_version=min_version, download_base="file:misc/dependencies/", download_delay=0)
+    if 'cygwin' in sys.platform.lower():
+        min_version='0.6c6'
+    else:
+        min_version='0.6a9'
+    use_setuptools(min_version=min_version, download_base="file:misc/dependencies/", download_delay=0)
 
 from setuptools import Extension, setup
-import re, os.path
 
 from calcdeps import install_requires, dependency_links