From: Zooko O'Whielacronx <zooko@zooko.com>
Date: Fri, 18 Apr 2008 20:24:59 +0000 (-0700)
Subject: setup: remove the try: except: around the import of pkg_resources -- we now require... 
X-Git-Tag: allmydata-tahoe-1.1.0~215
X-Git-Url: https://git.rkrishnan.org/listings/pb1server.py?a=commitdiff_plain;h=9613997ddbed652224c4661c9059d2ec2e7311cf;p=tahoe-lafs%2Ftahoe-lafs.git

setup: remove the try: except: around the import of pkg_resources -- we now require setuptools at run time and at build time
---

diff --git a/_auto_deps.py b/_auto_deps.py
index 78b040bc..dcff02fc 100644
--- a/_auto_deps.py
+++ b/_auto_deps.py
@@ -14,26 +14,17 @@ if hasattr(sys, 'frozen'):
     install_requires=[]
 
 def require_auto_deps():
-    try:
-        import pkg_resources
-    except:
-        # Then we can't assert that the versions of these packages are the right
-        # versions, but we can still try to use them anyway...
-        pass
-    else:
-        for requirement in install_requires:
-            try:
-                pkg_resources.require(requirement)
-            except pkg_resources.DistributionNotFound:
-                # there is no .egg-info present for this requirement, which
-                # either means that it isn't installed, or it is installed in a
-                # way that pkg_resources can't find it (but regular python
-                # might).  There are several older Linux distributions which
-                # provide our dependencies just fine, but they don't ship
-                # .egg-info files. Note that if there *is* an .egg-info file,
-                # but it shows a too-old version, then we'll get a
-                # VersionConflict error instead of DistributionNotFound.
-                pass
-
-if __name__ == "__main__":
-    require_auto_deps()
+    import pkg_resources
+    for requirement in install_requires:
+        try:
+            pkg_resources.require(requirement)
+        except pkg_resources.DistributionNotFound:
+            # there is no .egg-info present for this requirement, which
+            # either means that it isn't installed, or it is installed in a
+            # way that pkg_resources can't find it (but regular python
+            # might).  There are several older Linux distributions which
+            # provide our dependencies just fine, but they don't ship
+            # .egg-info files. Note that if there *is* an .egg-info file,
+            # but it shows a too-old version, then we'll get a
+            # VersionConflict error instead of DistributionNotFound.
+            pass