From 1cb657ddb20f80833ea989b786ee35c881279df8 Mon Sep 17 00:00:00 2001 From: Valentin Lorentz Date: Sat, 4 Aug 2012 13:21:37 +0200 Subject: [PATCH] Import imap directly from itertools instead of utils.iter. --- plugins/Games/plugin.py | 3 ++- src/irclib.py | 2 +- src/ircutils.py | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/plugins/Games/plugin.py b/plugins/Games/plugin.py index 15e6d4fee..22a1e07b7 100644 --- a/plugins/Games/plugin.py +++ b/plugins/Games/plugin.py @@ -30,6 +30,7 @@ import re import random +from itertools import imap import supybot.utils as utils from supybot.commands import * @@ -61,7 +62,7 @@ class Games(callbacks.Plugin): For example, 2d6 will roll 2 six-sided dice; 10d10 will roll 10 ten-sided dice. """ - (dice, sides) = utils.iter.imap(int, m.groups()) + (dice, sides) = imap(int, m.groups()) if dice > 1000: irc.error(_('You can\'t roll more than 1000 dice.')) elif sides > 100: diff --git a/src/irclib.py b/src/irclib.py index 85482ac70..a0579f5a5 100644 --- a/src/irclib.py +++ b/src/irclib.py @@ -42,7 +42,7 @@ import supybot.ircmsgs as ircmsgs import supybot.ircutils as ircutils from utils.str import rsplit -from utils.iter import imap, chain, cycle +from utils.iter import chain, cycle from utils.structures import queue, smallqueue, RingBuffer ### diff --git a/src/ircutils.py b/src/ircutils.py index f6741beda..752bee120 100644 --- a/src/ircutils.py +++ b/src/ircutils.py @@ -43,6 +43,7 @@ import textwrap from cStringIO import StringIO as sio import supybot.utils as utils +from itertools import imap def debug(s, *args): """Prints a debug string. Most likely replaced by our logging debug.""" @@ -492,7 +493,7 @@ def unDccIP(i): L.append(i % 256) i /= 256 L.reverse() - return '.'.join(utils.iter.imap(str, L)) + return '.'.join(imap(str, L)) class IrcString(str): """This class does case-insensitive comparison and hashing of nicks."""