From: Daira Hopwood Date: Tue, 7 Oct 2014 18:06:14 +0000 (+0100) Subject: Move require_more() to top-level. X-Git-Tag: allmydata-tahoe-1.10.1a1~122 X-Git-Url: https://git.rkrishnan.org/pf/content/en.html?a=commitdiff_plain;h=b2e897c2a9e05a1d954b77eda612293fac7069e2;p=tahoe-lafs%2Ftahoe-lafs.git Move require_more() to top-level. Signed-off-by: Daira Hopwood --- diff --git a/src/allmydata/_auto_deps.py b/src/allmydata/_auto_deps.py index 6365119e..55274d41 100644 --- a/src/allmydata/_auto_deps.py +++ b/src/allmydata/_auto_deps.py @@ -110,17 +110,15 @@ ignorable = [ 'twisted-conch', ] -def require_more(): - import sys +import sys - # Don't try to get the version number of setuptools in frozen builds, because - # that triggers 'site' processing that causes failures. Note that frozen - # builds still (unfortunately) import pkg_resources in .tac files, so the - # entry for setuptools in install_requires above isn't conditional. - if not hasattr(sys, 'frozen'): - package_imports.append(('setuptools', 'setuptools')) +# Don't try to get the version number of setuptools in frozen builds, because +# that triggers 'site' processing that causes failures. Note that frozen +# builds still (unfortunately) import pkg_resources in .tac files, so the +# entry for setuptools in install_requires above isn't conditional. +if not hasattr(sys, 'frozen'): + package_imports.append(('setuptools', 'setuptools')) -require_more() # These are suppressed globally: