Move require_more() to top-level.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
This commit is contained in:
Daira Hopwood 2014-10-07 19:06:14 +01:00
parent ea09305987
commit b2e897c2a9

View File

@ -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: