Fixes to irc despooler

2007-12-12 13:43:59 -07:00 · 2007-12-12 13:43:59 -07:00 · 2e1eb218ed
parent 9da0e88ea8
commit 2e1eb218ed
2 changed files with 7 additions and 6 deletions
--- a/arsenic.py
+++ b/arsenic.py
@ -160,7 +160,7 @@ if __name__ == '__main__':
    l1 = Arsenic(('irc.lanl.gov', 6667),
                 NICK,
                 INFO,
-                 ["#x"],
+                 ["#x", "#csirt"],
                 ssl=False)
    l1.debug = debug

--- a/irc.py
+++ b/irc.py
@ -472,11 +472,12 @@ class Bot(SmartIRCHandler):

            # Despool a line
            target, lines = which
+            if lines:
                line = lines[0]
                target.msg(line)
                del lines[0]
-            if not lines:
-                self._spool.remove((target, lines))
+            else:
+                self._spool.remove(which)

    def announce(self, text):
        for c in self.channels: