From 97e71bd2cdf60592404c2421532ab90292e99be5 Mon Sep 17 00:00:00 2001 From: James McCoy Date: Tue, 22 May 2012 22:11:41 -0400 Subject: [PATCH] Just create schedule.schedule/drivers.Twisted.poller without any guard These module-level variables had historically been created such that reloading the module wouldn't redefine the variable. However, none of our code reloads the modules and the guard to prevent redefining the variable was broken so it would've been redefined anyway. Signed-off-by: James McCoy --- src/drivers/Twisted.py | 5 +---- src/schedule.py | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/drivers/Twisted.py b/src/drivers/Twisted.py index c91d80d6b..b6d72fc90 100644 --- a/src/drivers/Twisted.py +++ b/src/drivers/Twisted.py @@ -155,9 +155,6 @@ class SupyReconnectingFactory(ReconnectingClientFactory, drivers.ServersMixin): return protocol Driver = SupyReconnectingFactory +poller = TwistedRunnerDriver() -try: - ignore(poller) -except NameError: - poller = TwistedRunnerDriver() # vim:set shiftwidth=4 softtabstop=4 expandtab textwidth=79: diff --git a/src/schedule.py b/src/schedule.py index 3b36a8a7a..677661201 100644 --- a/src/schedule.py +++ b/src/schedule.py @@ -131,11 +131,8 @@ class Schedule(drivers.IrcDriver): except Exception, e: log.exception('Uncaught exception in scheduled function:') -try: - ignore(schedule) -except NameError: - schedule = Schedule() +schedule = Schedule() addEvent = schedule.addEvent removeEvent = schedule.removeEvent rescheduleEvent = schedule.rescheduleEvent