pylint cleanup.

diff --git a/Makefile b/Makefile
index f77624c45fa827a568f91c8184efbfece51ccc38..06f4fc466995df1ea2260f3fbd9950920bc793f5 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -36,7 +36,7 @@ clean:
        rm -f irkerd.8 irkerhook.1 irker-*.tar.gz *~
        rm -f SHIPPER.* *.html
 
-PYLINTOPTS = --rcfile=/dev/null --reports=n --include-ids=y --disable="C0103,C0111,C0301,R0201,R0902,R0903,R0912,E1101,W0201,W0621,W0702,F0401"
+PYLINTOPTS = --rcfile=/dev/null --reports=n --include-ids=y --disable="C0103,C0111,C0301,R0201,R0902,R0903,R0912,R0915,E1101,W0201,W0621,W0702,F0401"
 pylint:
        @pylint --output-format=parseable $(PYLINTOPTS) irkerd
        @pylint --output-format=parseable $(PYLINTOPTS) irkerhook.py

diff --git a/irkerd b/irkerd
index 5b4e096ecf43a88f4f667744f6f1253ce7d9e0be..321bb5ff1a710a2065c01b09036a2cf7f0a8b527 100755 (executable)
--- a/irkerd
+++ b/irkerd
@@ -62,7 +62,7 @@ except ImportError:
     CONNECTION_MAX = 200
     green_threads = False
 
-import sys, getopt, urlparse, time, random, socket, signal
+import sys, getopt, urlparse, time, random, socket
 import threading, Queue, SocketServer
 import irc.client, logging
 try:
@@ -262,7 +262,7 @@ class Connection:
             # This is so we can see tracebacks for errors inside the thread
             # when we need to be able to for debugging purposes.
             if debuglvl > 0:
-                raise exc_type, exc_value, exc_traceback
+                raise exc_type, _exc_value, exc_traceback
     def live(self):
         "Should this connection not be scavenged?"
         return self.status != "expired"