pylint cleanup.

diff --git a/Makefile b/Makefile
index a8620aebfdb78d0c73d2b0b9b7d65d3c85fe782b..508165a3ab9fea59e27247775ff3add55a47d932 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -22,6 +22,11 @@ clean:
        rm -f irker irker.1 irker-*.rpm irker-*.tar.gz *~
        rm -f SHIPPER.* *.html
 
+PYLINTOPTS = --rcfile=/dev/null --reports=n --include-ids=y --disable="C0103,C0111,C0301,R0201,R0902"
+pylint:
+       @pylint --output-format=parseable $(PYLINTOPTS) irker.py
+
+
 SOURCES = README COPYING NEWS irker.py Makefile irker.xml irker-logo.jpg
 
 version:

diff --git a/irker.py b/irker.py
index d71a77b557e7b8c49d95e0948ebf69c5faba1a64..78b7bf121b20e7465c305027bb953f5ddd092cd9 100755 (executable)
--- a/irker.py
+++ b/irker.py
@@ -31,7 +31,7 @@ CONNECT_MAX = 18              # Max channels open per socket (freenet limit)
 
 # No user-serviceable parts below this line
 
-import sys, json, exceptions, getopt, urlparse, time, socket
+import sys, json, exceptions, getopt, urlparse, time
 import threading, Queue, SocketServer
 import irc.client, logging
 
@@ -137,18 +137,12 @@ class Irker:
     def __init__(self, debuglevel=0):
         self.debuglevel = debuglevel
         self.irc = irc.client.IRC()
-        self.irc.add_global_handler("ping",
-                                    lambda c, e: self._handle_ping(c,e))
-        self.irc.add_global_handler("welcome",
-                                    lambda c, e: self._handle_welcome(c,e))
-        self.irc.add_global_handler("erroneusnickname",
-                                    lambda c, e: self._handle_badnick(c,e))
-        self.irc.add_global_handler("nicknameinuse",
-                                    lambda c, e: self._handle_badnick(c,e))
-        self.irc.add_global_handler("nickcollision",
-                                    lambda c, e: self._handle_badnick(c,e))
-        self.irc.add_global_handler("unavailresource",
-                                    lambda c, e: self._handle_badnick(c,e))
+        self.irc.add_global_handler("ping", self._handle_ping)
+        self.irc.add_global_handler("welcome", self._handle_welcome)
+        self.irc.add_global_handler("erroneusnickname", self._handle_badnick)
+        self.irc.add_global_handler("nicknameinuse", self._handle_badnick)
+        self.irc.add_global_handler("nickcollision", self._handle_badnick)
+        self.irc.add_global_handler("unavailresource", self._handle_badnick)
         thread = threading.Thread(target=self.irc.process_forever)
         self.irc._thread = thread
         thread.start()