ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-06-01 15:20:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

setup: don't catch ImportError when importing _auto_deps in allmydata/__init__.py

Browse Source 
Nowadays pkg_resources is a runtime requirement, and if there is something screwed up in the installation, we want an explicit ImportError exception as early as possible.
This commit is contained in:
Zooko O'Whielacronx 2008-04-30 13:22:04 -07:00
parent 88951548ee
commit fc271a0ee9
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/allmydata/__init__.py
View File

@ -19,16 +19,8 @@ except ImportError:
hush_pyflakes = __version__ hush_pyflakes = __version__
del hush_pyflakes del hush_pyflakes
try: import _auto_deps
import _auto_deps _auto_deps.require_auto_deps()
except ImportError:
# Never mind -- even if we can't use pkg_resources to check the required
# version numbers and to select the right one in the case that more than one
# version is available, we can still barrel on and if "import thingie" gives
# us a thingie that works, we're okay.
pass
else:
_auto_deps.require_auto_deps()
def get_package_versions(): def get_package_versions():
import OpenSSL, allmydata, foolscap, nevow, pycryptopp, simplejson, twisted, zfec import OpenSSL, allmydata, foolscap, nevow, pycryptopp, simplejson, twisted, zfec