Import imap directly from itertools instead of utils.iter.

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:

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
 
 ###

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."""