From 9b8b7a5d86649be428577db18c2759a30e5dafbc Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone Date: Wed, 21 Oct 2020 10:16:44 -0400 Subject: [PATCH] Remove Nevow from the static script --- newsfragments/3434.minor | 0 static/tahoe.py | 20 ++++++++------------ 2 files changed, 8 insertions(+), 12 deletions(-) create mode 100644 newsfragments/3434.minor diff --git a/newsfragments/3434.minor b/newsfragments/3434.minor new file mode 100644 index 000000000..e69de29bb diff --git a/static/tahoe.py b/static/tahoe.py index cac53bdfa..c18f60e2c 100644 --- a/static/tahoe.py +++ b/static/tahoe.py @@ -3,23 +3,19 @@ # Import this first to suppress deprecation warnings. import allmydata -# nevow requires all these for its voodoo module import time adaptor registrations -from nevow import accessors, appserver, static, rend, url, util, query, i18n, flat -from nevow import guard, stan, testutil, context -from nevow.flat import flatmdom, flatstan, twist -from formless import webform, processors, annotate, iformless from decimal import Decimal from xml.dom import minidom import allmydata.web -# junk to appease pyflakes's outrage -[ - accessors, appserver, static, rend, url, util, query, i18n, flat, guard, stan, testutil, - context, flatmdom, flatstan, twist, webform, processors, annotate, iformless, Decimal, - minidom, allmydata, -] +# We import these things to give PyInstaller's dependency resolver some hints +# about what it needs to include. We don't use them otherwise _here_ but +# other parts of the codebase do. pyflakes points out that they are unused +# unless we use them. So ... use them. +Decimal +minidom +allmydata from allmydata.scripts import runner -runner.run() \ No newline at end of file +runner.run()