From 5be3e643d5cce9442be987c3d1955ab01c459cc8 Mon Sep 17 00:00:00 2001 From: Luke Rogers Date: Wed, 2 Oct 2013 19:43:12 +1300 Subject: [PATCH] right --- core/loader.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/core/loader.py b/core/loader.py index f56686f..464f889 100644 --- a/core/loader.py +++ b/core/loader.py @@ -34,7 +34,7 @@ class PluginLoader(object): self.path = os.path.abspath("plugins") self.bot = bot - self.event_handler = EventHandler(self, patterns=["*.py"]) + self.event_handler = PluginEventHandler(self, patterns=["*.py"]) self.observer.schedule(self.event_handler, self.path, recursive=False) self.observer.start() @@ -80,7 +80,8 @@ class PluginLoader(object): for type, data in obj._hook: self.bot.plugins[type] += [data] - self.bot.logger.info("Loaded plugin: {} ({})".format(format_plug(data), type)) + if not loaded_all: + self.bot.logger.info("Loaded plugin: {} ({})".format(format_plug(data), type)) if not loaded_all: self.rebuild() @@ -119,7 +120,7 @@ class PluginLoader(object): self.bot.events[event].append((func, args)) -class EventHandler(Trick): +class PluginEventHandler(Trick): def __init__(self, loader, *args, **kwargs): self.loader = loader Trick.__init__(self, *args, **kwargs)