Don't user dictionary’s iterator methods

8 files changed, 14 insertions, 14 deletions

diff --git a/module/plugins/internal/Account.py b/module/plugins/internal/Account.py
index f33d44179..b59a59932 100644
--- a/module/plugins/internal/Account.py
+++ b/module/plugins/internal/Account.py
@@ -88,7 +88,7 @@ class Account(Plugin):
 
     #@TODO: Rewrite in 0.4.10
     def init_accounts(self, accounts):
-        for user, data in accounts.iteritems():
+        for user, data in accounts.items():
             self.add(user, data['password'], data['options'])
             self._login(user)
 
@@ -254,7 +254,7 @@ class Account(Plugin):
 
     #: Remove in 0.4.10
     def getAllAccounts(self, *args, **kwargs):
-        return [self.getAccountData(user, *args, **kwargs) for user, info in self.info.iteritems()]
+        return [self.getAccountData(user, *args, **kwargs) for user, info in self.info.items()]
 
 
     def login_fail(self, reason=_("Login handshake has failed")):
@@ -281,7 +281,7 @@ class Account(Plugin):
         Returns an valid account name and data
         """
         usable = []
-        for user, info in self.info.iteritems():
+        for user, info in self.info.items():
             if not info['login']['valid']:
                 continue
 
diff --git a/module/plugins/internal/Addon.py b/module/plugins/internal/Addon.py
index 248518128..3c617f730 100644
--- a/module/plugins/internal/Addon.py
+++ b/module/plugins/internal/Addon.py
@@ -60,7 +60,7 @@ class Addon(Plugin):
 
     def init_events(self):
         if self.event_map:
-            for event, funcs in self.event_map.iteritems():
+            for event, funcs in self.event_map.items():
                 if type(funcs) in (list, tuple):
                     for f in funcs:
                         self.manager.addEvent(event, getattr(self, f))
diff --git a/module/plugins/internal/Crypter.py b/module/plugins/internal/Crypter.py
index 7e97c8228..c677b2852 100644
--- a/module/plugins/internal/Crypter.py
+++ b/module/plugins/internal/Crypter.py
@@ -57,7 +57,7 @@ class Crypter(Hoster):
         """
         Generate new packages from self.urls
         """
-        packages = [(name, links, None) for name, links in self.pyload.api.generatePackages(self.urls).iteritems()]
+        packages = [(name, links, None) for name, links in self.pyload.api.generatePackages(self.urls).items()]
         self.packages.extend(packages)
 
 
diff --git a/module/plugins/internal/Hoster.py b/module/plugins/internal/Hoster.py
index 840d73847..10cab5616 100644
--- a/module/plugins/internal/Hoster.py
+++ b/module/plugins/internal/Hoster.py
@@ -362,7 +362,7 @@ class Hoster(Plugin):
             self.fail(_("No url given"))
 
         if self.pyload.debug:
-            self.log_debug("DOWNLOAD URL " + url, *["%s=%s" % (key, val) for key, val in locals().iteritems() if key not in ("self", "url")])
+            self.log_debug("DOWNLOAD URL " + url, *["%s=%s" % (key, val) for key, val in locals().items() if key not in ("self", "url")])
 
         self.captcha.correct()
         self.check_for_same_files()
@@ -474,7 +474,7 @@ class Hoster(Plugin):
 
             #: Produces encoding errors, better log to other file in the future?
             # self.log_debug("Content: %s" % content)
-            for name, rule in rules.iteritems():
+            for name, rule in rules.items():
                 if isinstance(rule, basestring):
                     if rule in content:
                         do_delete = True
diff --git a/module/plugins/internal/MultiHook.py b/module/plugins/internal/MultiHook.py
index 0fa75df98..c49a3c89a 100644
--- a/module/plugins/internal/MultiHook.py
+++ b/module/plugins/internal/MultiHook.py
@@ -187,11 +187,11 @@ class MultiHook(Hook):
         excludedList = []
 
         if self.plugintype == "hoster":
-            pluginMap    = dict((name.lower(), name) for name in self.pyload.pluginManager.hosterPlugins.iterkeys())
+            pluginMap    = dict((name.lower(), name) for name in self.pyload.pluginManager.hosterPlugins.keys())
             accountList  = [account.type.lower() for account in self.pyload.api.getAccounts(False) if account.valid and account.premium]
         else:
             pluginMap    = {}
-            accountList  = [name[::-1].replace("Folder"[::-1], "", 1).lower()[::-1] for name in self.pyload.pluginManager.crypterPlugins.iterkeys()]
+            accountList  = [name[::-1].replace("Folder"[::-1], "", 1).lower()[::-1] for name in self.pyload.pluginManager.crypterPlugins.keys()]
 
         for plugin in self.plugins_cached():
             name = remove_chars(plugin, "-.")
diff --git a/module/plugins/internal/OCR.py b/module/plugins/internal/OCR.py
index 36d259e0c..9896837b5 100644
--- a/module/plugins/internal/OCR.py
+++ b/module/plugins/internal/OCR.py
@@ -260,7 +260,7 @@ class OCR(Plugin):
         hkey = 0
         hvalue = 0
 
-        for key, value in highest.iteritems():
+        for key, value in highest.items():
             if value > hvalue:
                 hkey = key
                 hvalue = value
@@ -325,7 +325,7 @@ class OCR(Plugin):
         else:
             result = self.result_captcha
 
-        for key, item in values.iteritems():
+        for key, item in values.items():
 
             if key.__class__ is str:
                 result = result.replace(key, item)
diff --git a/module/plugins/internal/Plugin.py b/module/plugins/internal/Plugin.py
index 02ef326d6..7b3d03752 100644
--- a/module/plugins/internal/Plugin.py
+++ b/module/plugins/internal/Plugin.py
@@ -94,7 +94,7 @@ def parse_html_form(attr_str, html, input_names={}):
 
         if input_names:
             #: Check input attributes
-            for key, val in input_names.iteritems():
+            for key, val in input_names.items():
                 if key in inputs:
                     if isinstance(val, basestring) and inputs[key] is val:
                         continue
@@ -271,7 +271,7 @@ class Plugin(object):
             self.fail(_("No url given"))
 
         if self.pyload.debug:
-            self.log_debug("LOAD URL " + url, *["%s=%s" % (key, val) for key, val in locals().iteritems() if key not in ("self", "url")])
+            self.log_debug("LOAD URL " + url, *["%s=%s" % (key, val) for key, val in locals().items() if key not in ("self", "url")])
 
         if req is None:
             if hasattr(self, "req"):
diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py
index 8eea9dd5a..b063bcac2 100644
--- a/module/plugins/internal/SimpleHoster.py
+++ b/module/plugins/internal/SimpleHoster.py
@@ -18,7 +18,7 @@ from module.utils import fixup, fs_encode, parseFileSize as parse_size
 
 
 #@TODO: Adapt and move to PyFile in 0.4.10
-statusMap = dict((v, k) for k, v in _statusMap.iteritems())
+statusMap = dict((v, k) for k, v in _statusMap.items())
 
 
 class SimpleHoster(Hoster):