summaryrefslogtreecommitdiffstats
path: root/module/plugins/hooks
diff options
context:
space:
mode:
Diffstat (limited to 'module/plugins/hooks')
-rw-r--r--module/plugins/hooks/CaptchaTrader.py4
-rw-r--r--module/plugins/hooks/Ev0InFetcher.py2
-rw-r--r--module/plugins/hooks/MultiHome.py2
-rw-r--r--module/plugins/hooks/RealdebridCom.py2
-rw-r--r--module/plugins/hooks/RehostTo.py4
-rw-r--r--module/plugins/hooks/UpdateManager.py2
6 files changed, 8 insertions, 8 deletions
diff --git a/module/plugins/hooks/CaptchaTrader.py b/module/plugins/hooks/CaptchaTrader.py
index c41ed9f97..a0e8a0453 100644
--- a/module/plugins/hooks/CaptchaTrader.py
+++ b/module/plugins/hooks/CaptchaTrader.py
@@ -132,12 +132,12 @@ class CaptchaTrader(Hook):
self.logInfo(_("Your CaptchaTrader Account has not enough credits"))
def captchaCorrect(self, task):
- if task.data.has_key("ticket"):
+ if "ticket" in task.data:
ticket = task.data["ticket"]
self.respond(ticket, True)
def captchaInvalid(self, task):
- if task.data.has_key("ticket"):
+ if "ticket" in task.data:
ticket = task.data["ticket"]
self.respond(ticket, False)
diff --git a/module/plugins/hooks/Ev0InFetcher.py b/module/plugins/hooks/Ev0InFetcher.py
index 5eb4e09c1..c7191cd4e 100644
--- a/module/plugins/hooks/Ev0InFetcher.py
+++ b/module/plugins/hooks/Ev0InFetcher.py
@@ -42,7 +42,7 @@ class Ev0InFetcher(Hook, PluginStorage):
sortedLinks = {}
for url, hoster in results:
- if not sortedLinks.has_key(hoster):
+ if hoster not in sortedLinks:
sortedLinks[hoster] = []
sortedLinks[hoster].append(url)
diff --git a/module/plugins/hooks/MultiHome.py b/module/plugins/hooks/MultiHome.py
index dc7bd3b49..f15148538 100644
--- a/module/plugins/hooks/MultiHome.py
+++ b/module/plugins/hooks/MultiHome.py
@@ -71,7 +71,7 @@ class Interface(object):
self.history = {}
def lastPluginAccess(self, pluginName, account):
- if self.history.has_key((pluginName, account)):
+ if (pluginName, account) in self.history:
return self.history[(pluginName, account)]
return 0
diff --git a/module/plugins/hooks/RealdebridCom.py b/module/plugins/hooks/RealdebridCom.py
index 2c8bf1259..59035926a 100644
--- a/module/plugins/hooks/RealdebridCom.py
+++ b/module/plugins/hooks/RealdebridCom.py
@@ -48,7 +48,7 @@ class RealdebridCom(Hook):
for hoster in self.getHostersCached():
name = removeChars(hoster.lower(), "-.")
- if pluginMap.has_key(name):
+ if name in pluginMap:
supported.append(pluginMap[name])
else:
new_supported.append(hoster)
diff --git a/module/plugins/hooks/RehostTo.py b/module/plugins/hooks/RehostTo.py
index 324ef9b91..48b0fd826 100644
--- a/module/plugins/hooks/RehostTo.py
+++ b/module/plugins/hooks/RehostTo.py
@@ -60,7 +60,7 @@ class RehostTo(Hook):
for hoster in self.getHostersCached():
name = removeChars(hoster.lower(), "-.")
- if pluginMap.has_key(name):
+ if name in pluginMap:
supported.append(pluginMap[name])
else:
new_supported.append(hoster)
@@ -81,4 +81,4 @@ class RehostTo(Hook):
dict = self.core.pluginManager.hosterPlugins["RehostTo"]
dict["pattern"] = regexp
- dict["re"] = re.compile(regexp) \ No newline at end of file
+ dict["re"] = re.compile(regexp)
diff --git a/module/plugins/hooks/UpdateManager.py b/module/plugins/hooks/UpdateManager.py
index dc8eafbb8..7f4d57947 100644
--- a/module/plugins/hooks/UpdateManager.py
+++ b/module/plugins/hooks/UpdateManager.py
@@ -106,7 +106,7 @@ class UpdateManager(Hook):
plugins = getattr(self.core.pluginManager, "%sPlugins" % type)
- if plugins.has_key(tmp_name):
+ if tmp_name in plugins:
if float(plugins[tmp_name]["v"]) >= float(version):
continue