mirror of
https://github.com/tahoe-lafs/tahoe-lafs.git
synced 2025-04-07 10:56:49 +00:00
setup: don't catch ImportError when importing _auto_deps in allmydata/__init__.py
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:
parent
88951548ee
commit
fc271a0ee9
@ -19,16 +19,8 @@ except ImportError:
|
||||
hush_pyflakes = __version__
|
||||
del hush_pyflakes
|
||||
|
||||
try:
|
||||
import _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()
|
||||
import _auto_deps
|
||||
_auto_deps.require_auto_deps()
|
||||
|
||||
def get_package_versions():
|
||||
import OpenSSL, allmydata, foolscap, nevow, pycryptopp, simplejson, twisted, zfec
|
||||
|
Loading…
x
Reference in New Issue
Block a user