From 84f931bb9ff7ebf2aec0a758ac0a9e06beb6afb6 Mon Sep 17 00:00:00 2001 From: James Vega Date: Sat, 11 Oct 2003 21:03:02 +0000 Subject: [PATCH] Lots of pylint cleanups --- plugins/ChannelDB.py | 2 +- plugins/Debian.py | 1 - plugins/Enforcer.py | 1 + plugins/Factoids.py | 2 +- plugins/FreeBSD.py | 5 ++++- plugins/Friendly.py | 4 ---- plugins/FunCommands.py | 10 +--------- plugins/FunDB.py | 4 ++-- plugins/Gameknot.py | 1 - plugins/Google.py | 1 + plugins/Http.py | 4 +--- plugins/IMDB.py | 1 - plugins/Markov.py | 7 +++++-- plugins/Math.py | 5 +++-- plugins/News.py | 1 - plugins/Notes.py | 1 - plugins/Parter.py | 2 +- plugins/Quotes.py | 11 +++-------- plugins/Relay.py | 2 -- plugins/Services.py | 1 - plugins/Status.py | 2 +- plugins/Topic.py | 1 + 22 files changed, 26 insertions(+), 43 deletions(-) diff --git a/plugins/ChannelDB.py b/plugins/ChannelDB.py index 0af1011f7..ea278b04e 100644 --- a/plugins/ChannelDB.py +++ b/plugins/ChannelDB.py @@ -350,7 +350,7 @@ class ChannelDB(plugins.ChannelDBHandler, callbacks.PrivmsgCommandAndRegexp): FROM karma WHERE %s ORDER BY added-subtracted DESC""" % criteria cursor.execute(sql, *args) - s = utils.commaAndify(['%s: %s' % (n,t) + s = utils.commaAndify(['%s: %s' % (n, t) for (n,t) in cursor.fetchall()]) irc.reply(msg, s + '.') else: # No name was given. Return the top/bottom 3 karmas. diff --git a/plugins/Debian.py b/plugins/Debian.py index 356df913d..624f12bd5 100644 --- a/plugins/Debian.py +++ b/plugins/Debian.py @@ -40,7 +40,6 @@ import gzip import sets import getopt import popen2 -import random import fnmatch import os.path import urllib2 diff --git a/plugins/Enforcer.py b/plugins/Enforcer.py index 49dfb4e2d..a2d3980e1 100644 --- a/plugins/Enforcer.py +++ b/plugins/Enforcer.py @@ -37,6 +37,7 @@ Enforcer: Enforces capabilities on a channel, watching MODEs, KICKs, import plugins import conf +import debug import ircdb import ircmsgs import privmsgs diff --git a/plugins/Factoids.py b/plugins/Factoids.py index 194264a6c..1abe0429b 100644 --- a/plugins/Factoids.py +++ b/plugins/Factoids.py @@ -233,7 +233,7 @@ class Factoids(plugins.ChannelDBHandler, callbacks.Privmsg): capability = ircdb.makeChannelCapability(channel, 'factoids') if ircdb.checkCapability(msg.prefix, capability): cursor = db.cursor() - cursor.execute("UPDATE keys SET locked=0 WHERE key LIKE %s",key) + cursor.execute("UPDATE keys SET locked=0 WHERE key LIKE %s", key) db.commit() irc.reply(msg, conf.replySuccess) else: diff --git a/plugins/FreeBSD.py b/plugins/FreeBSD.py index e4b717911..34a625f78 100755 --- a/plugins/FreeBSD.py +++ b/plugins/FreeBSD.py @@ -35,14 +35,17 @@ Provides FreeBSD ports searching and other FreeBSD-specific services. import plugins +import time import string import getopt import os.path +import urllib2 import sqlite +import conf import debug -import utils +import ircutils import privmsgs import callbacks diff --git a/plugins/Friendly.py b/plugins/Friendly.py index d56d2bed3..f91d617eb 100755 --- a/plugins/Friendly.py +++ b/plugins/Friendly.py @@ -35,10 +35,6 @@ Just a regexp module to make the bot a wee bit friendlier. import plugins -import re - -import ircmsgs -import ircutils import callbacks class Friendly(callbacks.PrivmsgRegexp): diff --git a/plugins/FunCommands.py b/plugins/FunCommands.py index 5add09440..34c721098 100644 --- a/plugins/FunCommands.py +++ b/plugins/FunCommands.py @@ -34,30 +34,22 @@ Provides a multitude of fun, useless commands. """ import plugins -from itertools import imap, ifilter -import os import gc import re -import imp import sys -import new import md5 import sha -import time -import socket import string import random import urllib import inspect -import telnetlib -import threading import mimetypes #import conf import debug import utils -import ircmsgs +import ircutils import privmsgs import callbacks diff --git a/plugins/FunDB.py b/plugins/FunDB.py index 6b78b98d2..c0ba92d00 100755 --- a/plugins/FunDB.py +++ b/plugins/FunDB.py @@ -35,16 +35,16 @@ Provides fun commands that require a database to operate. import plugins +import re import sets import time -import atexit import string -import random import os.path import sqlite import conf +import debug import ircdb import utils import world diff --git a/plugins/Gameknot.py b/plugins/Gameknot.py index 05ddbf2b4..6f4a156c5 100644 --- a/plugins/Gameknot.py +++ b/plugins/Gameknot.py @@ -40,7 +40,6 @@ import urllib2 import debug import utils -import ircmsgs import ircutils import privmsgs import callbacks diff --git a/plugins/Google.py b/plugins/Google.py index 1e05162dc..c8648b1a1 100644 --- a/plugins/Google.py +++ b/plugins/Google.py @@ -46,6 +46,7 @@ import google import conf import utils import ircmsgs +import ircutils import privmsgs import callbacks import structures diff --git a/plugins/Http.py b/plugins/Http.py index 276bad3e2..e7dda3450 100644 --- a/plugins/Http.py +++ b/plugins/Http.py @@ -37,14 +37,12 @@ import plugins import re import sets -import time import urllib2 import utils import debug import privmsgs import callbacks -import structures example = utils.wrapLines(""" @list Http @@ -105,7 +103,7 @@ class Http(callbacks.Privmsg): _fmProject = re.compile('([^<]+)') _fmVersion = re.compile('([^<]+)') _fmVitality = re.compile('([^<]+)') - _fmPopular=re.compile('([^<]+)') + _fmPopular = re.compile('([^<]+)') _fmLastUpdated = re.compile('([^<]+)') def freshmeat(self, irc, msg, args): """ diff --git a/plugins/IMDB.py b/plugins/IMDB.py index 19a7ea984..53a7675c4 100644 --- a/plugins/IMDB.py +++ b/plugins/IMDB.py @@ -39,7 +39,6 @@ import plugins import IMDb import utils -import ircutils import privmsgs import callbacks diff --git a/plugins/Markov.py b/plugins/Markov.py index 7446257b2..4cac13af6 100644 --- a/plugins/Markov.py +++ b/plugins/Markov.py @@ -58,7 +58,6 @@ def configure(onStart, afterConnect, advanced): onStart.append('load Markov') class Markov(plugins.ChannelDBHandler, callbacks.Privmsg): - threaded = True def __init__(self): plugins.ChannelDBHandler.__init__(self) callbacks.Privmsg.__init__(self) @@ -120,6 +119,7 @@ class Markov(plugins.ChannelDBHandler, callbacks.Privmsg): return callbacks.Privmsg.doPrivmsg(self, irc, msg) _maxMarkovLength = 80 + _minMarkovLength = 7 def markov(self, irc, msg, args): """[] @@ -157,7 +157,10 @@ class Markov(plugins.ChannelDBHandler, callbacks.Privmsg): if word is None: break words.append(word) - irc.reply(msg, ' '.join(words)) + if len(words) < self._minMarkovLength: + self.markov(irc, msg, args) + else: + irc.reply(msg, ' '.join(words)) def markovpairs(self, irc, msg, args): """[] diff --git a/plugins/Math.py b/plugins/Math.py index 8e1fd87fa..26c73edbf 100644 --- a/plugins/Math.py +++ b/plugins/Math.py @@ -44,6 +44,7 @@ from itertools import imap import unum.units +import debug import utils import privmsgs import callbacks @@ -214,12 +215,12 @@ class Math(callbacks.Privmsg): try: u1 = eval(unit1.lower(), self._convertEnv, self._convertEnv) except: - irc.error(msg, '%s is not a valid units expression.' % units1) + irc.error(msg, '%s is not a valid units expression.' % unit1) return try: u2 = eval(unit2.lower(), self._convertEnv, self._convertEnv) except: - irc.error(msg, '%s is not a valid units expression.' % units2) + irc.error(msg, '%s is not a valid units expression.' % unit2) return try: irc.reply(msg, str((n*u1).as(u2))) diff --git a/plugins/News.py b/plugins/News.py index 8d65ed95c..783afecb7 100644 --- a/plugins/News.py +++ b/plugins/News.py @@ -44,7 +44,6 @@ import sqlite import conf import ircdb import utils -import ircutils import privmsgs import callbacks diff --git a/plugins/Notes.py b/plugins/Notes.py index 7f43fffd7..ab8666a8d 100644 --- a/plugins/Notes.py +++ b/plugins/Notes.py @@ -38,7 +38,6 @@ import plugins import time import os.path -from itertools import imap import sqlite diff --git a/plugins/Parter.py b/plugins/Parter.py index 83dd23a9a..130366954 100644 --- a/plugins/Parter.py +++ b/plugins/Parter.py @@ -41,8 +41,8 @@ import plugins import conf import utils import ircdb -import irclib import ircmsgs +import ircutils import privmsgs import callbacks diff --git a/plugins/Quotes.py b/plugins/Quotes.py index ed04d92ee..0acc6e862 100644 --- a/plugins/Quotes.py +++ b/plugins/Quotes.py @@ -112,13 +112,8 @@ class Quotes(plugins.ChannelDBHandler, callbacks.Privmsg): maxid = int(cursor.fetchone()[0]) if maxid is None: maxid = 0 - if maxid == 1: - IS = 'is' - QUOTE = 'quote' - else: - IS = 'are' - QUOTE = 'quotes' - s = 'There %s %s %s in my database.' % (IS, maxid, QUOTE) + QUOTE = utils.pluralize(maxid, 'quote') + s = 'There %s %s %s in my database.' % (utils.be(maxid), maxid, QUOTE) irc.reply(msg, s) def quote(self, irc, msg, args): @@ -208,7 +203,7 @@ class Quotes(plugins.ChannelDBHandler, callbacks.Privmsg): cursor.execute("""SELECT id FROM quotes ORDER BY random() LIMIT 1""") - if cursor.rowcount != 1: + if cursor.rowcount != 1: irc.error(msg, 'It seems that quote database is empty.') return (id,) = cursor.fetchone() diff --git a/plugins/Relay.py b/plugins/Relay.py index 0f8da94fe..d38ac9b11 100644 --- a/plugins/Relay.py +++ b/plugins/Relay.py @@ -36,13 +36,11 @@ Handles relaying between networks. import plugins import re -import sets import time import conf import debug import utils -import ircdb import irclib import drivers import ircmsgs diff --git a/plugins/Services.py b/plugins/Services.py index fb50f692b..ad00fbb77 100644 --- a/plugins/Services.py +++ b/plugins/Services.py @@ -39,7 +39,6 @@ import re import time import conf -import ircdb import ircmsgs import privmsgs import ircutils diff --git a/plugins/Status.py b/plugins/Status.py index 6e5fb952d..a5dd4bf83 100644 --- a/plugins/Status.py +++ b/plugins/Status.py @@ -95,7 +95,7 @@ class Status(callbacks.Privmsg): (user, system, childUser, childSystem, elapsed) = os.times() timeRunning = time.time() - world.startedAt activeThreads = threading.activeCount() - response ='I have taken %s seconds of user time and %s seconds of '\ + response = 'I have taken %s seconds of user time and %s seconds of '\ 'system time, for a total of %s seconds of CPU time. My '\ 'children have taken %s seconds of user time and %s seconds'\ ' of system time for a total of %s seconds of CPU time. ' \ diff --git a/plugins/Topic.py b/plugins/Topic.py index 93c137e71..8b8ee9b31 100644 --- a/plugins/Topic.py +++ b/plugins/Topic.py @@ -38,6 +38,7 @@ import plugins import re import random +import conf import debug import utils import ircdb