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

diff --git a/setup.py b/setup.py
index e40f5446f1d93c8cae494c112aa4afe1b7bb2788..ea4b017263f5c26fd8845ca7c62fc23469fb4fd3 100644 (file)
--- 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