sopel: replace obsolete tools.iteritems

Author: Exirel

sopel/bot.py

@@ -349,7 +349,7 @@ def __setup_plugins_check_manual_url_callbacks(self, name):
             # nothing to check
             return
 
-        for key, callback in tools.iteritems(self.memory['url_callbacks']):
+        for key, callback in self.memory['url_callbacks'].items():
             is_checked = getattr(
                 callback, '_sopel_url_callbacks_checked', False)
             if is_checked:
@@ -1207,7 +1207,7 @@ def search_url_callbacks(self, url):
             # nothing to search
             return
 
-        for regex, function in tools.iteritems(self.memory['url_callbacks']):
+        for regex, function in self.memory['url_callbacks'].items():
             match = regex.search(url)
             if match:
                 yield function, match

sopel/coretasks.py

@@ -36,7 +36,7 @@
 from sopel.config import ConfigurationError
 from sopel.irc import isupport
 from sopel.irc.utils import CapReq, MyInfo
-from sopel.tools import events, Identifier, iteritems, SopelMemory, target, web
+from sopel.tools import events, Identifier, SopelMemory, target, web
 
 
 LOGGER = logging.getLogger(__name__)
@@ -447,7 +447,7 @@ def handle_names(bot, trigger):
 
     for name in names:
         priv = 0
-        for prefix, value in iteritems(mapping):
+        for prefix, value in mapping.items():
             if prefix in name:
                 priv = priv | value
         nick = Identifier(name.lstrip(''.join(mapping.keys())))
@@ -915,7 +915,7 @@ def acct_warn(bot, cap):
         if cap not in bot._cap_reqs:
             bot._cap_reqs[cap] = [CapReq('', 'coretasks', acct_warn)]
 
-    for cap, reqs in iteritems(bot._cap_reqs):
+    for cap, reqs in bot._cap_reqs.items():
         # At this point, we know mandatory and prohibited don't co-exist, but
         # we need to call back for optionals if they're also prohibited
         prefix = ''

sopel/loader.py

@@ -17,7 +17,6 @@
 import sys
 
 from sopel.config.core_section import COMMAND_DEFAULT_HELP_PREFIX
-from sopel.tools import itervalues
 
 
 LOGGER = logging.getLogger(__name__)
@@ -268,7 +267,7 @@ def clean_module(module, config):
     shutdowns = []
     jobs = []
     urls = []
-    for obj in itervalues(vars(module)):
+    for obj in vars(module).values():
         if callable(obj):
             is_sopel_callable = getattr(obj, '_sopel_callable', False) is True
             if getattr(obj, '__name__', None) == 'shutdown':

sopel/modules/remind.py

@@ -19,7 +19,7 @@
 
 import pytz
 
-from sopel import plugin, tools
+from sopel import plugin
 from sopel.tools.time import format_time, get_timezone, validate_timezone
 
 
@@ -95,7 +95,7 @@ def dump_database(filename, data):
     If the file does not exist, it is created.
     """
     with io.open(filename, 'w', encoding='utf-8') as database:
-        for unixtime, reminders in tools.iteritems(data):
+        for unixtime, reminders in data.items():
             for channel, nick, message in reminders:
                 line = '%s\t%s\t%s\t%s\n' % (unixtime, channel, nick, message)
                 database.write(line)

sopel/modules/safety.py

@@ -240,7 +240,7 @@ def _clean_cache(bot):
             # clean up by age first
             cutoff = time.time() - (7 * 24 * 60 * 60)  # 7 days ago
             old_keys = []
-            for key, data in tools.iteritems(bot.memory['safety_cache']):
+            for key, data in bot.memory['safety_cache'].items():
                 if data['fetched'] <= cutoff:
                     old_keys.append(key)
             for key in old_keys:

sopel/test_tools.py

@@ -114,7 +114,7 @@ def unregister_url_callback(self, pattern, callback):
             pass
 
     def search_url_callbacks(self, url):
-        for regex, function in tools.iteritems(self.memory['url_callbacks']):
+        for regex, function in self.memory['url_callbacks'].items():
             match = regex.search(url)
             if match:
                 yield function, match

sopel/tools/__init__.py

@@ -32,6 +32,8 @@
 from . import time, web  # NOQA
 
 
+# Kept for backward compatibility
+# TODO: consider removing that
 raw_input = input
 iteritems = dict.items
 itervalues = dict.values