notnull/banned
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move local import globally

Browse Source 
This used to be needed since there used to be a circular import. Guess
it's gone now!
This commit is contained in:
Vgr E. Barry 2016-08-13 12:09:19 -04:00
parent 4631d3dd1d
commit 273db4b553
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gamemodes.py
View File

@ -9,6 +9,7 @@ import botconfig
import src.settings as var import src.settings as var
from src.utilities import * from src.utilities import *
from src.messages import messages from src.messages import messages
from src.decorators import handle_error
from src import events from src import events
def game_mode(name, minp, maxp, likelihood = 0): def game_mode(name, minp, maxp, likelihood = 0):
@ -882,8 +883,6 @@ class SleepyMode(GameMode):
def setup_nightmares(self, evt, cli, var): def setup_nightmares(self, evt, cli, var):
if random.random() < 1/5: if random.random() < 1/5:
from src import decorators
self.do_nightmare = decorators.handle_error(self.do_nightmare)
self.having_nightmare = True self.having_nightmare = True
with var.WARNING_LOCK: with var.WARNING_LOCK:
t = threading.Timer(60, self.do_nightmare, (cli, var, random.choice(list_players()), var.NIGHT_COUNT)) t = threading.Timer(60, self.do_nightmare, (cli, var, random.choice(list_players()), var.NIGHT_COUNT))
@ -896,6 +895,7 @@ class SleepyMode(GameMode):
if self.having_nightmare == prefix: if self.having_nightmare == prefix:
self.having_nightmare = nick self.having_nightmare = nick
@handle_error
def do_nightmare(self, cli, var, target, night): def do_nightmare(self, cli, var, target, night):
if var.PHASE != "night" or var.NIGHT_COUNT != night: if var.PHASE != "night" or var.NIGHT_COUNT != night:
return return