Changed some more webutils uses to utils.web.

This commit is contained in:
Jeremy Fincher 2005-01-29 19:20:15 +00:00
parent 6fbfa2bc9e
commit 0a7fdae08d

View File

@ -38,7 +38,6 @@ import supybot.utils as utils
from supybot.commands import * from supybot.commands import *
import supybot.ircutils as ircutils import supybot.ircutils as ircutils
import supybot.registry as registry import supybot.registry as registry
import supybot.webutils as webutils
import supybot.callbacks as callbacks import supybot.callbacks as callbacks
class Dict(callbacks.Privmsg): class Dict(callbacks.Privmsg):
@ -55,7 +54,7 @@ class Dict(callbacks.Privmsg):
dbs.sort() dbs.sort()
irc.reply(utils.str.commaAndify(dbs)) irc.reply(utils.str.commaAndify(dbs))
except socket.error, e: except socket.error, e:
irc.error(webutils.strError(e)) irc.error(utils.web.strError(e))
dictionaries = wrap(dictionaries) dictionaries = wrap(dictionaries)
def random(self, irc, msg, args): def random(self, irc, msg, args):
@ -69,7 +68,7 @@ class Dict(callbacks.Privmsg):
dbs = conn.getdbdescs().keys() dbs = conn.getdbdescs().keys()
irc.reply(random.choice(dbs)) irc.reply(random.choice(dbs))
except socket.error, e: except socket.error, e:
irc.error(webutils.strError(e)) irc.error(utils.web.strError(e))
random = wrap(random) random = wrap(random)
def dict(self, irc, msg, args, words): def dict(self, irc, msg, args, words):
@ -81,7 +80,7 @@ class Dict(callbacks.Privmsg):
server = conf.supybot.plugins.Dict.server() server = conf.supybot.plugins.Dict.server()
conn = dictclient.Connection(server) conn = dictclient.Connection(server)
except socket.error, e: except socket.error, e:
irc.error(webutils.strError(e), Raise=True) irc.error(utils.web.strError(e), Raise=True)
dbs = sets.Set(conn.getdbdescs()) dbs = sets.Set(conn.getdbdescs())
if words[0] in dbs: if words[0] in dbs:
dictionary = words.pop(0) dictionary = words.pop(0)