Shut up, pylint!

diff --git a/Makefile b/Makefile
index da28471775169c90a224914a795b971d16c3d562..c99472cd07972345de925e8f51a2c3486ba780e9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -46,7 +46,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,R0915,E1101,W0201,W0621,W0702,F0401"
+PYLINTOPTS = --rcfile=/dev/null --reports=n --include-ids=y --disable="C0103,C0111,C0301,R0201,R0902,R0903,R0912,R0914,R0915,E1101,W0201,W0212,W0621,W0702,F0401"
 pylint:
        @pylint --output-format=parseable $(PYLINTOPTS) irkerd
        @pylint --output-format=parseable $(PYLINTOPTS) irkerhook.py

diff --git a/irkerd b/irkerd
index f6c7146b77ccc05f4e1d7e49dfec2c1156a441ac..b2bc9ce9791faeadd20b2e05835fcf197bf04200 100755 (executable)
--- a/irkerd
+++ b/irkerd
@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-from __future__ import with_statement
 """
 irkerd - a simple IRC multiplexer daemon
 
@@ -26,6 +25,8 @@ the irc client library at version >= 3.4 which requires 2.6: see
 
 http://pypi.python.org/pypi/irc/
 """
+from __future__ import with_statement
+
 # These things might need tuning
 
 HOST = "localhost"