remove _trigger_function code, it's not used any more

1 files changed, 2 insertions, 12 deletions

diff --git a/src/IRCBot.py b/src/IRCBot.py
index ffa6ad97..fe62a071 100644
--- a/src/IRCBot.py
+++ b/src/IRCBot.py
@@ -48,7 +48,6 @@ class Bot(object):
         self._read_thread = None
         self._write_thread = None
 
-        self._trigger_functions = []
         self._events.on("timer.reconnect").hook(self._timed_reconnect)
 
     def _trigger_both(self):
@@ -288,20 +287,11 @@ class Bot(object):
                 self._event_queue.put(lambda: None)
                 break
 
-            self.trigger(self._check)
+            #self.trigger(self._check)
+            self._event_queue.put(self._check)
 
             events = self._read_poll.poll(self.get_poll_timeout())
 
-            for func, func_queue in self._trigger_functions:
-                try:
-                    returned = func()
-                    type = TriggerResult.Return
-                except Exception as e:
-                    returned = e
-                    type = TriggerResult.Exception
-                func_queue.put([type, returned])
-            self._trigger_functions.clear()
-
             for fd, event in events:
                 if fd == self._rtrigger_server.fileno():
                     # throw away data from trigger socket