From: Alexander van Gessel <ai0867@gmail.com>
Date: Tue, 26 Nov 2013 20:47:26 +0000 (+0100)
Subject: Remove some irclib cruft
X-Git-Tag: 2.2~7
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=929d06eeb5192ab2673ababf82025ef3b8cdf4b5;p=irker.git

Remove some irclib cruft

Signed-off-by: Eric S. Raymond <esr@thyrsus.com>
---

diff --git a/irkerd b/irkerd
index ddd3f9c..24b3e77 100755
--- a/irkerd
+++ b/irkerd
@@ -705,9 +705,6 @@ class Irker:
         if connection.context:
             cxt = connection.context
             arguments = event.arguments
-            # irclib 5.0 compatibility, because the maintainer is a fool
-            if callable(arguments):
-                arguments = arguments()
             for lump in arguments:
                 if lump.startswith("DEAF="):
                     if not logfile:
@@ -739,10 +736,6 @@ class Irker:
     def _handle_kick(self, connection, event):
         "Server hung up the connection."
         target = event.target
-        # irclib 5.0 compatibility, because the maintainer continues
-        # to be a fool.
-        if callable(target):
-            target = target()
         self.irc.debug(1, "irker has been kicked from %s on %s" % (target, connection.server))
         if connection.context:
             connection.context.handle_kick(target)