From 2c099ffa0d7412ab721df30c8217dc0fc9cde808 Mon Sep 17 00:00:00 2001 From: david-sarah <david-sarah@jacaranda.org> Date: Sat, 25 Dec 2010 20:21:00 -0800 Subject: [PATCH] Move dependency imports from windows/depends.py (which has gone away) into src/allmydata/windows/tahoesvc.py. Also fix a pyflakes warning, and change the service display name from 'Allmydata Tahoe Node' to 'Tahoe-LAFS node'. refs #1282 --- src/allmydata/windows/tahoesvc.py | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/src/allmydata/windows/tahoesvc.py b/src/allmydata/windows/tahoesvc.py index a2b5392a..efaa439d 100644 --- a/src/allmydata/windows/tahoesvc.py +++ b/src/allmydata/windows/tahoesvc.py @@ -43,7 +43,7 @@ except: class Tahoe(win32serviceutil.ServiceFramework): _svc_name_ = "Tahoe" - _svc_display_name_ = "Allmydata Tahoe Node" + _svc_display_name_ = "Tahoe-LAFS Node" def __init__(self, args): logmsg("init") try: @@ -131,8 +131,22 @@ class Tahoe(win32serviceutil.ServiceFramework): try: logmsg("main thread startup") - import depends # import dependencies so that py2exe finds them - _junk = depends # appease pyflakes + # import dependencies so that py2exe finds them + # 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 + + import allmydata.web + + # junk to appease pyflakes's outrage at py2exe's needs + [ + accessors, appserver, static, rend, url, util, query, i18n, flat, guard, stan, testutil, + context, flatmdom, flatstan, twist, webform, processors, annotate, iformless, Decimal, + allmydata, + ] from twisted.internet import reactor from twisted.python import log, logfile -- 2.45.2