aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric S. Raymond <esr@thyrsus.com>2016-03-11 16:48:23 -0500
committerEric S. Raymond <esr@thyrsus.com>2016-03-11 16:48:23 -0500
commit9eb85b124773f519c51beb1a9bf4de108b6a5176 (patch)
treee32dae9a33cd1ba821f56fc68f473aaf0b7539b2
parentFix a dropped stich in the 2-to-3 port. (diff)
downloadirker-9eb85b124773f519c51beb1a9bf4de108b6a5176.tar.xz
Remove some irclib remnants.
-rwxr-xr-xirkerd10
1 files changed, 3 insertions, 7 deletions
diff --git a/irkerd b/irkerd
index 941af00..6a1888c 100755
--- a/irkerd
+++ b/irkerd
@@ -644,7 +644,7 @@ class Connection:
self.connection.privmsg(channel, segment)
except ValueError as err:
LOG.warning((
- "irclib rejected a message to %s on %s "
+ "rejected a message to %s on %s "
"because: %s") % (
channel, self.target, UNICODE_TYPE(err)))
LOG.debug(traceback.format_exc())
@@ -663,12 +663,8 @@ class Connection:
self.status = "expired"
LOG.debug(traceback.format_exc())
finally:
- try:
- # Make sure we don't leave any zombies behind
- self.connection.close()
- except:
- # Irclib has a habit of throwing fresh exceptions here. Ignore that
- pass
+ # Make sure we don't leave any zombies behind
+ self.connection.close()
def live(self):
"Should this connection not be scavenged?"
return self.status != "expired"