summaryrefslogtreecommitdiffstats
path: root/module/plugins/hooks
diff options
context:
space:
mode:
Diffstat (limited to 'module/plugins/hooks')
-rw-r--r--module/plugins/hooks/BypassCaptcha.py6
-rw-r--r--module/plugins/hooks/Captcha9Kw.py6
-rw-r--r--module/plugins/hooks/CaptchaBrotherhood.py4
-rw-r--r--module/plugins/hooks/Checksum.py4
-rw-r--r--module/plugins/hooks/DeathByCaptcha.py4
-rw-r--r--module/plugins/hooks/IRC.py4
-rw-r--r--module/plugins/hooks/ImageTyperz.py4
-rw-r--r--module/plugins/hooks/SkipRev.py4
-rw-r--r--module/plugins/hooks/UnSkipOnFail.py6
-rw-r--r--module/plugins/hooks/UpdateManager.py6
10 files changed, 24 insertions, 24 deletions
diff --git a/module/plugins/hooks/BypassCaptcha.py b/module/plugins/hooks/BypassCaptcha.py
index bc28b1469..700eb3b0a 100644
--- a/module/plugins/hooks/BypassCaptcha.py
+++ b/module/plugins/hooks/BypassCaptcha.py
@@ -28,7 +28,7 @@ class BypassCaptchaException(Exception):
class BypassCaptcha(Addon):
__name__ = "BypassCaptcha"
__type__ = "hook"
- __version__ = "0.10"
+ __version__ = "0.11"
__status__ = "testing"
__config__ = [("activated" , "bool" , "Activated" , False),
@@ -115,12 +115,12 @@ class BypassCaptcha(Addon):
def captcha_correct(self, task):
- if task.data['service'] is self.classname and "ticket" in task.data:
+ if task.data['service'] == self.classname and "ticket" in task.data:
self.respond(task.data['ticket'], True)
def captcha_invalid(self, task):
- if task.data['service'] is self.classname and "ticket" in task.data:
+ if task.data['service'] == self.classname and "ticket" in task.data:
self.respond(task.data['ticket'], False)
diff --git a/module/plugins/hooks/Captcha9Kw.py b/module/plugins/hooks/Captcha9Kw.py
index 714be8bc4..438a29165 100644
--- a/module/plugins/hooks/Captcha9Kw.py
+++ b/module/plugins/hooks/Captcha9Kw.py
@@ -13,7 +13,7 @@ from module.plugins.internal.Addon import Addon, threaded
class Captcha9Kw(Addon):
__name__ = "Captcha9Kw"
__type__ = "hook"
- __version__ = "0.32"
+ __version__ = "0.33"
__status__ = "testing"
__config__ = [("activated" , "bool" , "Activated" , False ),
@@ -80,7 +80,7 @@ class Captcha9Kw(Addon):
for opt in str(self.config.get('hoster_options').split('|')):
details = map(str.strip, opt.split(':'))
- if not details or details[0].lower() is not pluginname.lower():
+ if not details or details[0].lower() != pluginname.lower():
continue
for d in details:
@@ -191,7 +191,7 @@ class Captcha9Kw(Addon):
for opt in str(self.config.get('hoster_options').split('|')):
details = map(str.strip, opt.split(':'))
- if not details or details[0].lower() is not pluginname.lower():
+ if not details or details[0].lower() != pluginname.lower():
continue
for d in details:
diff --git a/module/plugins/hooks/CaptchaBrotherhood.py b/module/plugins/hooks/CaptchaBrotherhood.py
index 15546c63f..74f971439 100644
--- a/module/plugins/hooks/CaptchaBrotherhood.py
+++ b/module/plugins/hooks/CaptchaBrotherhood.py
@@ -39,7 +39,7 @@ class CaptchaBrotherhoodException(Exception):
class CaptchaBrotherhood(Addon):
__name__ = "CaptchaBrotherhood"
__type__ = "hook"
- __version__ = "0.12"
+ __version__ = "0.13"
__status__ = "testing"
__config__ = [("activated" , "bool" , "Activated" , False),
@@ -155,7 +155,7 @@ class CaptchaBrotherhood(Addon):
def captcha_invalid(self, task):
- if task.data['service'] is self.classname and "ticket" in task.data:
+ if task.data['service'] == self.classname and "ticket" in task.data:
self.api_response("complainCaptcha", task.data['ticket'])
diff --git a/module/plugins/hooks/Checksum.py b/module/plugins/hooks/Checksum.py
index af6f2f406..cdda86a27 100644
--- a/module/plugins/hooks/Checksum.py
+++ b/module/plugins/hooks/Checksum.py
@@ -38,7 +38,7 @@ def compute_checksum(local_file, algorithm):
class Checksum(Addon):
__name__ = "Checksum"
__type__ = "hook"
- __version__ = "0.24"
+ __version__ = "0.25"
__status__ = "broken"
__config__ = [("activated" , "bool" , "Activated" , False ),
@@ -190,7 +190,7 @@ class Checksum(Addon):
algorithm = self.methods.get(file_type, file_type)
checksum = compute_checksum(local_file, algorithm)
- if checksum is data['HASH']:
+ if checksum == data['HASH']:
self.log_info(_('File integrity of "%s" verified by %s checksum (%s)') %
(data['NAME'], algorithm, checksum))
else:
diff --git a/module/plugins/hooks/DeathByCaptcha.py b/module/plugins/hooks/DeathByCaptcha.py
index 7e50a97f3..f8e637aff 100644
--- a/module/plugins/hooks/DeathByCaptcha.py
+++ b/module/plugins/hooks/DeathByCaptcha.py
@@ -51,7 +51,7 @@ class DeathByCaptchaException(Exception):
class DeathByCaptcha(Addon):
__name__ = "DeathByCaptcha"
__type__ = "hook"
- __version__ = "0.11"
+ __version__ = "0.12"
__status__ = "testing"
__config__ = [("activated" , "bool" , "Activated" , False),
@@ -197,7 +197,7 @@ class DeathByCaptcha(Addon):
def captcha_invalid(self, task):
- if task.data['service'] is self.classname and "ticket" in task.data:
+ if task.data['service'] == self.classname and "ticket" in task.data:
try:
res = self.api_response("captcha/%d/report" % task.data['ticket'], True)
diff --git a/module/plugins/hooks/IRC.py b/module/plugins/hooks/IRC.py
index 65ae2a356..91f9ddf5e 100644
--- a/module/plugins/hooks/IRC.py
+++ b/module/plugins/hooks/IRC.py
@@ -19,7 +19,7 @@ from module.internal.misc import formatSize
class IRC(Thread, Notifier):
__name__ = "IRC"
__type__ = "hook"
- __version__ = "0.19"
+ __version__ = "0.20"
__status__ = "testing"
__config__ = [("activated", "bool", "Activated" , False ),
@@ -155,7 +155,7 @@ class IRC(Thread, Notifier):
if not msg['origin'].split("!", 1)[0] in self.config.get('owner').split():
return
- if msg['target'].split("!", 1)[0] is not self.config.get('nick'):
+ if msg['target'].split("!", 1)[0] != self.config.get('nick'):
return
if msg['action'] != "PRIVMSG":
diff --git a/module/plugins/hooks/ImageTyperz.py b/module/plugins/hooks/ImageTyperz.py
index 4c43c9189..7b9ca3a46 100644
--- a/module/plugins/hooks/ImageTyperz.py
+++ b/module/plugins/hooks/ImageTyperz.py
@@ -32,7 +32,7 @@ class ImageTyperzException(Exception):
class ImageTyperz(Addon):
__name__ = "ImageTyperz"
__type__ = "hook"
- __version__ = "0.11"
+ __version__ = "0.12"
__status__ = "testing"
__config__ = [("activated" , "bool" , "Activated" , False),
@@ -131,7 +131,7 @@ class ImageTyperz(Addon):
def captcha_invalid(self, task):
- if task.data['service'] is self.classname and "ticket" in task.data:
+ if task.data['service'] == self.classname and "ticket" in task.data:
res = self.load(self.RESPOND_URL,
post={'action': "SETBADIMAGE",
'username': self.config.get('username'),
diff --git a/module/plugins/hooks/SkipRev.py b/module/plugins/hooks/SkipRev.py
index c318e3247..24bf610d1 100644
--- a/module/plugins/hooks/SkipRev.py
+++ b/module/plugins/hooks/SkipRev.py
@@ -9,7 +9,7 @@ from module.plugins.internal.Addon import Addon
class SkipRev(Addon):
__name__ = "SkipRev"
__type__ = "hook"
- __version__ = "0.36"
+ __version__ = "0.37"
__status__ = "testing"
__config__ = [("activated", "bool" , "Activated" , False ),
@@ -42,7 +42,7 @@ class SkipRev(Addon):
def download_preparing(self, pyfile):
name = self._name(pyfile)
- if pyfile.statusname is _("unskipped") or not name.endswith(".rev") or not ".part" in name:
+ if pyfile.statusname == "unskipped" or not name.endswith(".rev") or not ".part" in name:
return
revtokeep = -1 if self.config.get('mode') == "Auto" else self.config.get('revtokeep')
diff --git a/module/plugins/hooks/UnSkipOnFail.py b/module/plugins/hooks/UnSkipOnFail.py
index 35ff91672..f31d574cd 100644
--- a/module/plugins/hooks/UnSkipOnFail.py
+++ b/module/plugins/hooks/UnSkipOnFail.py
@@ -7,7 +7,7 @@ from module.plugins.internal.Addon import Addon
class UnSkipOnFail(Addon):
__name__ = "UnSkipOnFail"
__type__ = "hook"
- __version__ = "0.12"
+ __version__ = "0.13"
__status__ = "testing"
__config__ = [("activated", "bool", "Activated", True)]
@@ -55,7 +55,7 @@ class UnSkipOnFail(Addon):
"""
for pinfo in self.pyload.api.getQueue():
#: Check if package-folder equals pyfile's package folder
- if pinfo.folder is not pyfile.package().folder:
+ if pinfo.folder != pyfile.package().folder:
continue
#: Now get packaged data w/ files/links
@@ -67,7 +67,7 @@ class UnSkipOnFail(Addon):
#: Check if link name collides with pdata's name
#: and at last check if it is not pyfile itself
- if link.name is pyfile.name and link.fid is not pyfile.id:
+ if link.name == pyfile.name and link.fid != pyfile.id:
return link
diff --git a/module/plugins/hooks/UpdateManager.py b/module/plugins/hooks/UpdateManager.py
index 28a8ece39..d8635e9c6 100644
--- a/module/plugins/hooks/UpdateManager.py
+++ b/module/plugins/hooks/UpdateManager.py
@@ -15,7 +15,7 @@ from module.plugins.internal.misc import encode, exists, fsjoin
class UpdateManager(Addon):
__name__ = "UpdateManager"
__type__ = "hook"
- __version__ = "1.08"
+ __version__ = "1.09"
__status__ = "testing"
__config__ = [("activated" , "bool", "Activated" , True ),
@@ -252,8 +252,8 @@ class UpdateManager(Addon):
if blacklist:
#@NOTE: Protect UpdateManager from self-removing
- blacklisted_plugins = [(plugin['type'], plugin['name']) for plugin in blacklist \
- if plugin['name'] is not self.classname and plugin['type'] is not self.__type__]
+ blacklisted_plugins = [(plugin['type'], plugin['name']) for plugin in blacklist
+ if plugin['name'] != self.classname and plugin['type'] != self.__type__]
c = 1
l = len(blacklisted_plugins)
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-04 08:09:26 +0200