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
-rwxr-xr-xmodule/plugins/hooks/Captcha9kw.py8
-rw-r--r--module/plugins/hooks/CaptchaBrotherhood.py4
-rw-r--r--module/plugins/hooks/Checksum.py18
-rw-r--r--module/plugins/hooks/DeathByCaptcha.py6
-rw-r--r--module/plugins/hooks/EasybytezCom.py6
-rw-r--r--module/plugins/hooks/ExpertDecoders.py6
-rw-r--r--module/plugins/hooks/ExternalScripts.py12
-rw-r--r--module/plugins/hooks/ExtractArchive.py14
-rw-r--r--module/plugins/hooks/IRCInterface.py24
-rw-r--r--module/plugins/hooks/ImageTyperz.py4
-rw-r--r--module/plugins/hooks/LinkdecrypterCom.py6
-rw-r--r--module/plugins/hooks/MegaDebridEu.py2
-rw-r--r--module/plugins/hooks/MergeFiles.py12
-rw-r--r--module/plugins/hooks/MultiHome.py2
-rw-r--r--module/plugins/hooks/RehostTo.py4
-rw-r--r--module/plugins/hooks/UpdateManager.py18
-rw-r--r--module/plugins/hooks/XFileSharingPro.py8
-rw-r--r--module/plugins/hooks/XMPPInterface.py8
19 files changed, 82 insertions, 86 deletions
diff --git a/module/plugins/hooks/BypassCaptcha.py b/module/plugins/hooks/BypassCaptcha.py
index 05cf29500..5ac117818 100644
--- a/module/plugins/hooks/BypassCaptcha.py
+++ b/module/plugins/hooks/BypassCaptcha.py
@@ -125,11 +125,11 @@ class BypassCaptcha(Hook):
def captchaCorrect(self, task):
if task.data['service'] == self.__name__ and "ticket" in task.data:
- self.respond(task.data["ticket"], True)
+ self.respond(task.data['ticket'], True)
def captchaInvalid(self, task):
if task.data['service'] == self.__name__ and "ticket" in task.data:
- self.respond(task.data["ticket"], False)
+ self.respond(task.data['ticket'], False)
def processCaptcha(self, task):
c = task.captchaFile
@@ -139,5 +139,5 @@ class BypassCaptcha(Hook):
task.error = e.getCode()
return
- task.data["ticket"] = ticket
+ task.data['ticket'] = ticket
task.setResult(result)
diff --git a/module/plugins/hooks/Captcha9kw.py b/module/plugins/hooks/Captcha9kw.py
index 28bce3d2b..b4e3ad34b 100755
--- a/module/plugins/hooks/Captcha9kw.py
+++ b/module/plugins/hooks/Captcha9kw.py
@@ -60,7 +60,7 @@ class Captcha9kw(Hook):
if response.isdigit():
self.logInfo(_("%s credits left") % response)
- self.info["credits"] = credits = int(response)
+ self.info['credits'] = credits = int(response)
return credits
else:
self.logError(response)
@@ -106,7 +106,7 @@ class Captcha9kw(Hook):
time.sleep(3)
result = response2
- task.data["ticket"] = response
+ task.data['ticket'] = response
self.logInfo("result %s : %s" % (response, result))
task.setResult(result)
else:
@@ -142,7 +142,7 @@ class Captcha9kw(Hook):
"correct": "1",
"pyload": "1",
"source": "pyload",
- "id": task.data["ticket"]})
+ "id": task.data['ticket']})
self.logInfo("Request correct: %s" % response)
except BadHeader, e:
@@ -161,7 +161,7 @@ class Captcha9kw(Hook):
"correct": "2",
"pyload": "1",
"source": "pyload",
- "id": task.data["ticket"]})
+ "id": task.data['ticket']})
self.logInfo("Request refund: %s" % response)
except BadHeader, e:
diff --git a/module/plugins/hooks/CaptchaBrotherhood.py b/module/plugins/hooks/CaptchaBrotherhood.py
index b413bdb59..54dfbe4d6 100644
--- a/module/plugins/hooks/CaptchaBrotherhood.py
+++ b/module/plugins/hooks/CaptchaBrotherhood.py
@@ -71,7 +71,7 @@ class CaptchaBrotherhood(Hook):
else:
credits = int(response[3:])
self.logInfo(_("%d credits left") % credits)
- self.info["credits"] = credits
+ self.info['credits'] = credits
return credits
def submit(self, captcha, captchaType="file", match=None):
@@ -167,5 +167,5 @@ class CaptchaBrotherhood(Hook):
task.error = e.getCode()
return
- task.data["ticket"] = ticket
+ task.data['ticket'] = ticket
task.setResult(result)
diff --git a/module/plugins/hooks/Checksum.py b/module/plugins/hooks/Checksum.py
index 8566a847e..a51eb4b47 100644
--- a/module/plugins/hooks/Checksum.py
+++ b/module/plugins/hooks/Checksum.py
@@ -80,7 +80,7 @@ class Checksum(Hook):
self.algorithms = sorted(
getattr(hashlib, "algorithms", ("md5", "sha1", "sha224", "sha256", "sha384", "sha512")), reverse=True)
self.algorithms.extend(["crc32", "adler32"])
- self.formats = self.algorithms + ['sfv', 'crc', 'hash']
+ self.formats = self.algorithms + ["sfv", "crc", "hash"]
def downloadFinished(self, pyfile):
"""
@@ -158,15 +158,15 @@ class Checksum(Hook):
download_folder = save_join(self.config['general']['download_folder'], pypack.folder, "")
for link in pypack.getChildren().itervalues():
- file_type = splitext(link["name"])[1][1:].lower()
+ file_type = splitext(link['name'])[1][1:].lower()
#self.logDebug(link, file_type)
if file_type not in self.formats:
continue
- hash_file = fs_encode(save_join(download_folder, link["name"]))
+ hash_file = fs_encode(save_join(download_folder, link['name']))
if not isfile(hash_file):
- self.logWarning("File not found: %s" % link["name"])
+ self.logWarning("File not found: %s" % link['name'])
continue
with open(hash_file) as f:
@@ -174,14 +174,14 @@ class Checksum(Hook):
for m in re.finditer(self.regexps.get(file_type, self.regexps['default']), text):
data = m.groupdict()
- self.logDebug(link["name"], data)
+ self.logDebug(link['name'], data)
- local_file = fs_encode(save_join(download_folder, data["name"]))
+ local_file = fs_encode(save_join(download_folder, data['name']))
algorithm = self.methods.get(file_type, file_type)
checksum = computeChecksum(local_file, algorithm)
- if checksum == data["hash"]:
+ if checksum == data['hash']:
self.logInfo('File integrity of "%s" verified by %s checksum (%s).' %
- (data["name"], algorithm, checksum))
+ (data['name'], algorithm, checksum))
else:
self.logWarning("%s checksum for file %s does not match (%s != %s)" %
- (algorithm, data["name"], checksum, data["hash"]))
+ (algorithm, data['name'], checksum, data['hash']))
diff --git a/module/plugins/hooks/DeathByCaptcha.py b/module/plugins/hooks/DeathByCaptcha.py
index 5a5ab7933..64ed2280f 100644
--- a/module/plugins/hooks/DeathByCaptcha.py
+++ b/module/plugins/hooks/DeathByCaptcha.py
@@ -183,7 +183,7 @@ class DeathByCaptcha(Hook):
self.logError(e.getDesc())
return False
- balance, rate = self.info["balance"], self.info["rate"]
+ balance, rate = self.info['balance'], self.info['rate']
self.logInfo("Account balance: US$%.3f (%d captchas left at %.2f cents each)" % (balance / 100,
balance // rate, rate))
@@ -196,7 +196,7 @@ class DeathByCaptcha(Hook):
def captchaInvalid(self, task):
if task.data['service'] == self.__name__ and "ticket" in task.data:
try:
- response = self.call_api("captcha/%d/report" % task.data["ticket"], True)
+ response = self.call_api("captcha/%d/report" % task.data['ticket'], True)
except DeathByCaptchaException, e:
self.logError(e.getDesc())
except Exception, e:
@@ -211,5 +211,5 @@ class DeathByCaptcha(Hook):
self.logError(e.getDesc())
return
- task.data["ticket"] = ticket
+ task.data['ticket'] = ticket
task.setResult(result)
diff --git a/module/plugins/hooks/EasybytezCom.py b/module/plugins/hooks/EasybytezCom.py
index d3cda7b80..533301a4e 100644
--- a/module/plugins/hooks/EasybytezCom.py
+++ b/module/plugins/hooks/EasybytezCom.py
@@ -32,6 +32,6 @@ class EasybytezCom(MultiHoster):
except Exception, e:
self.logDebug(e)
self.logWarning("Unable to load supported hoster list, using last known")
- return ['bitshare.com', 'crocko.com', 'ddlstorage.com', 'depositfiles.com', 'extabit.com', 'hotfile.com',
- 'mediafire.com', 'netload.in', 'rapidgator.net', 'rapidshare.com', 'uploading.com', 'uload.to',
- 'uploaded.to']
+ return ["bitshare.com", "crocko.com", "ddlstorage.com", "depositfiles.com", "extabit.com", "hotfile.com",
+ "mediafire.com", "netload.in", "rapidgator.net", "rapidshare.com", "uploading.com", "uload.to",
+ "uploaded.to"]
diff --git a/module/plugins/hooks/ExpertDecoders.py b/module/plugins/hooks/ExpertDecoders.py
index 65edd487b..9e151f8f6 100644
--- a/module/plugins/hooks/ExpertDecoders.py
+++ b/module/plugins/hooks/ExpertDecoders.py
@@ -51,14 +51,14 @@ class ExpertDecoders(Hook):
if response.isdigit():
self.logInfo(_("%s credits left") % response)
- self.info["credits"] = credits = int(response)
+ self.info['credits'] = credits = int(response)
return credits
else:
self.logError(response)
return 0
def processCaptcha(self, task):
- task.data["ticket"] = ticket = uuid4()
+ task.data['ticket'] = ticket = uuid4()
result = None
with open(task.captchaFile, 'rb') as f:
@@ -102,7 +102,7 @@ class ExpertDecoders(Hook):
try:
response = getURL(self.API_URL, post={"action": "refund", "key": self.getConfig("passkey"),
- "gen_task_id": task.data["ticket"]})
+ "gen_task_id": task.data['ticket']})
self.logInfo("Request refund: %s" % response)
except BadHeader, e:
diff --git a/module/plugins/hooks/ExternalScripts.py b/module/plugins/hooks/ExternalScripts.py
index 55aae1093..7f76df1cd 100644
--- a/module/plugins/hooks/ExternalScripts.py
+++ b/module/plugins/hooks/ExternalScripts.py
@@ -40,9 +40,9 @@ class ExternalScripts(Hook):
def setup(self):
self.scripts = {}
- folders = ['download_preparing', 'download_finished', 'package_finished',
- 'before_reconnect', 'after_reconnect', 'unrar_finished',
- 'all_dls_finished', 'all_dls_processed']
+ folders = ["download_preparing", "download_finished", "package_finished",
+ "before_reconnect", "after_reconnect", "unrar_finished",
+ "all_dls_finished", "all_dls_processed"]
for folder in folders:
self.scripts[folder] = []
@@ -106,13 +106,13 @@ class ExternalScripts(Hook):
self.callScript(script, ip)
def unrarFinished(self, folder, fname):
- for script in self.scripts["unrar_finished"]:
+ for script in self.scripts['unrar_finished']:
self.callScript(script, folder, fname)
def allDownloadsFinished(self):
- for script in self.scripts["all_dls_finished"]:
+ for script in self.scripts['all_dls_finished']:
self.callScript(script)
def allDownloadsProcessed(self):
- for script in self.scripts["all_dls_processed"]:
+ for script in self.scripts['all_dls_processed']:
self.callScript(script)
diff --git a/module/plugins/hooks/ExtractArchive.py b/module/plugins/hooks/ExtractArchive.py
index a2e7d1dac..c307deb8f 100644
--- a/module/plugins/hooks/ExtractArchive.py
+++ b/module/plugins/hooks/ExtractArchive.py
@@ -163,7 +163,7 @@ class ExtractArchive(Hook):
if not exists(out):
makedirs(out)
- files_ids = [(save_join(dl, p.folder, x["name"]), x["id"]) for x in p.getChildren().itervalues()]
+ files_ids = [(save_join(dl, p.folder, x['name']), x['id']) for x in p.getChildren().itervalues()]
matched = False
# check as long there are unseen files
@@ -307,15 +307,15 @@ class ExtractArchive(Hook):
if not exists(f):
continue
try:
- if self.config["permission"]["change_file"]:
+ if self.config['permission']['change_file']:
if isfile(f):
- chmod(f, int(self.config["permission"]["file"], 8))
+ chmod(f, int(self.config['permission']['file'], 8))
elif isdir(f):
- chmod(f, int(self.config["permission"]["folder"], 8))
+ chmod(f, int(self.config['permission']['folder'], 8))
- if self.config["permission"]["change_dl"] and os.name != "nt":
- uid = getpwnam(self.config["permission"]["user"])[2]
- gid = getgrnam(self.config["permission"]["group"])[2]
+ if self.config['permission']['change_dl'] and os.name != "nt":
+ uid = getpwnam(self.config['permission']['user'])[2]
+ gid = getgrnam(self.config['permission']['group'])[2]
chown(f, uid, gid)
except Exception, e:
self.logWarning(_("Setting User and Group failed"), e)
diff --git a/module/plugins/hooks/IRCInterface.py b/module/plugins/hooks/IRCInterface.py
index 7dbe835c7..9a9bab9b4 100644
--- a/module/plugins/hooks/IRCInterface.py
+++ b/module/plugins/hooks/IRCInterface.py
@@ -155,25 +155,25 @@ class IRCInterface(Thread, Hook):
self.handle_events(msg)
def handle_events(self, msg):
- if not msg["origin"].split("!", 1)[0] in self.getConfig("owner").split():
+ if not msg['origin'].split("!", 1)[0] in self.getConfig("owner").split():
return
- if msg["target"].split("!", 1)[0] != self.getConfig("nick"):
+ if msg['target'].split("!", 1)[0] != self.getConfig("nick"):
return
- if msg["action"] != "PRIVMSG":
+ if msg['action'] != "PRIVMSG":
return
# HANDLE CTCP ANTI FLOOD/BOT PROTECTION
- if msg["text"] == "\x01VERSION\x01":
+ if msg['text'] == "\x01VERSION\x01":
self.logDebug("Sending CTCP VERSION.")
self.sock.send("NOTICE %s :%s\r\n" % (msg['origin'], "pyLoad! IRC Interface"))
return
- elif msg["text"] == "\x01TIME\x01":
+ elif msg['text'] == "\x01TIME\x01":
self.logDebug("Sending CTCP TIME.")
self.sock.send("NOTICE %s :%d\r\n" % (msg['origin'], time.time()))
return
- elif msg["text"] == "\x01LAG\x01":
+ elif msg['text'] == "\x01LAG\x01":
self.logDebug("Received CTCP LAG.") # don't know how to answer
return
@@ -181,7 +181,7 @@ class IRCInterface(Thread, Hook):
args = None
try:
- temp = msg["text"].split()
+ temp = msg['text'].split()
trigger = temp[0]
if len(temp) > 1:
args = temp[1:]
@@ -192,7 +192,7 @@ class IRCInterface(Thread, Hook):
try:
res = handler(args)
for line in res:
- self.response(line, msg["origin"])
+ self.response(line, msg['origin'])
except Exception, e:
self.logError("pyLoad IRC: " + repr(e))
@@ -258,7 +258,7 @@ class IRCInterface(Thread, Hook):
def event_info(self, args):
if not args:
- return ['ERROR: Use info like this: info <id>']
+ return ["ERROR: Use info like this: info <id>"]
info = None
try:
@@ -271,7 +271,7 @@ class IRCInterface(Thread, Hook):
def event_packinfo(self, args):
if not args:
- return ['ERROR: Use packinfo like this: packinfo <id>']
+ return ["ERROR: Use packinfo like this: packinfo <id>"]
lines = []
pack = None
@@ -321,7 +321,7 @@ class IRCInterface(Thread, Hook):
def event_add(self, args):
if len(args) < 2:
return ['ERROR: Add links like this: "add <packagename|id> links". ',
- 'This will add the link <link> to to the package <package> / the package with id <id>!']
+ "This will add the link <link> to to the package <package> / the package with id <id>!"]
pack = args[0].strip()
links = [x.strip() for x in args[1:]]
@@ -336,7 +336,7 @@ class IRCInterface(Thread, Hook):
#TODO add links
- return ["INFO: Added %d links to Package %s [#%d]" % (len(links), pack["name"], id)]
+ return ["INFO: Added %d links to Package %s [#%d]" % (len(links), pack['name'], id)]
except:
# create new package
diff --git a/module/plugins/hooks/ImageTyperz.py b/module/plugins/hooks/ImageTyperz.py
index 794db3913..4d7be96e3 100644
--- a/module/plugins/hooks/ImageTyperz.py
+++ b/module/plugins/hooks/ImageTyperz.py
@@ -136,7 +136,7 @@ class ImageTyperz(Hook):
if task.data['service'] == self.__name__ and "ticket" in task.data:
response = getURL(self.RESPOND_URL, post={"action": "SETBADIMAGE", "username": self.getConfig("username"),
"password": self.getConfig("passkey"),
- "imageid": task.data["ticket"]})
+ "imageid": task.data['ticket']})
if response == "SUCCESS":
self.logInfo("Bad captcha solution received, requested refund")
@@ -151,5 +151,5 @@ class ImageTyperz(Hook):
task.error = e.getCode()
return
- task.data["ticket"] = ticket
+ task.data['ticket'] = ticket
task.setResult(result)
diff --git a/module/plugins/hooks/LinkdecrypterCom.py b/module/plugins/hooks/LinkdecrypterCom.py
index 75995faf2..d6acac4a9 100644
--- a/module/plugins/hooks/LinkdecrypterCom.py
+++ b/module/plugins/hooks/LinkdecrypterCom.py
@@ -48,7 +48,7 @@ class LinkdecrypterCom(Hook):
return
builtin = [name.lower() for name in self.core.pluginManager.crypterPlugins.keys()]
- builtin.extend(["downloadserienjunkiesorg"])
+ builtin.append("downloadserienjunkiesorg")
crypter_pattern = re.compile("(\w[\w.-]+)")
online = []
@@ -64,7 +64,7 @@ class LinkdecrypterCom(Hook):
regexp = r"https?://([^.]+\.)*?(%s)/.*" % "|".join(online)
dict = self.core.pluginManager.crypterPlugins[self.__name__]
- dict["pattern"] = regexp
- dict["re"] = re.compile(regexp)
+ dict['pattern'] = regexp
+ dict['re'] = re.compile(regexp)
self.logDebug("REGEXP: " + regexp)
diff --git a/module/plugins/hooks/MegaDebridEu.py b/module/plugins/hooks/MegaDebridEu.py
index 31be74fdd..22945cc0f 100644
--- a/module/plugins/hooks/MegaDebridEu.py
+++ b/module/plugins/hooks/MegaDebridEu.py
@@ -36,7 +36,7 @@ class MegaDebridEu(MultiHoster):
reponse = getURL('http://www.mega-debrid.eu/api.php?action=getHosters')
json_data = json_loads(reponse)
- if json_data["response_code"] == "ok":
+ if json_data['response_code'] == "ok":
host_list = [element[0] for element in json_data['hosters']]
else:
self.logError("Unable to retrieve hoster list")
diff --git a/module/plugins/hooks/MergeFiles.py b/module/plugins/hooks/MergeFiles.py
index e7bd63d17..5d6c208a7 100644
--- a/module/plugins/hooks/MergeFiles.py
+++ b/module/plugins/hooks/MergeFiles.py
@@ -47,12 +47,12 @@ class MergeFiles(Hook):
files = {}
fid_dict = {}
for fid, data in pack.getChildren().iteritems():
- if re.search("\.[0-9]{3}$", data["name"]):
- if data["name"][:-4] not in files:
- files[data["name"][:-4]] = []
- files[data["name"][:-4]].append(data["name"])
- files[data["name"][:-4]].sort()
- fid_dict[data["name"]] = fid
+ if re.search("\.[0-9]{3}$", data['name']):
+ if data['name'][:-4] not in files:
+ files[data['name'][:-4]] = []
+ files[data['name'][:-4]].append(data['name'])
+ files[data['name'][:-4]].sort()
+ fid_dict[data['name']] = fid
download_folder = self.config['general']['download_folder']
diff --git a/module/plugins/hooks/MultiHome.py b/module/plugins/hooks/MultiHome.py
index 31bbbcc9a..b9c663046 100644
--- a/module/plugins/hooks/MultiHome.py
+++ b/module/plugins/hooks/MultiHome.py
@@ -38,7 +38,7 @@ class MultiHome(Hook):
self.interfaces = []
self.parseInterfaces(self.getConfig("interfaces").split(";"))
if not self.interfaces:
- self.parseInterfaces([self.config["download"]["interface"]])
+ self.parseInterfaces([self.config['download']['interface']])
self.setConfig("interfaces", self.toConfig())
def toConfig(self):
diff --git a/module/plugins/hooks/RehostTo.py b/module/plugins/hooks/RehostTo.py
index 0841e07a6..96e06950e 100644
--- a/module/plugins/hooks/RehostTo.py
+++ b/module/plugins/hooks/RehostTo.py
@@ -34,7 +34,7 @@ class RehostTo(MultiHoster):
return
data = self.account.getAccountInfo(user)
- self.ses = data["ses"]
- self.long_ses = data["long_ses"]
+ self.ses = data['ses']
+ self.long_ses = data['long_ses']
return MultiHoster.coreReady(self)
diff --git a/module/plugins/hooks/UpdateManager.py b/module/plugins/hooks/UpdateManager.py
index 242659d9e..b6ba853a7 100644
--- a/module/plugins/hooks/UpdateManager.py
+++ b/module/plugins/hooks/UpdateManager.py
@@ -95,7 +95,7 @@ class UpdateManager(Hook):
return True if self.core.pluginManager.reloadPlugins(reloads) else False
def periodical(self):
- if not self.info["pyload"] and not (self.getConfig("nodebugupdate") and self.core.debug):
+ if not self.info['pyload'] and not (self.getConfig("nodebugupdate") and self.core.debug):
self.updating = True
self.update(onlyplugin=True if self.getConfig("mode") == "plugins only" else False)
self.updating = False
@@ -127,15 +127,15 @@ class UpdateManager(Hook):
newversion = data[0]
self.logInfo(_("*** New pyLoad Version %s available ***") % newversion)
self.logInfo(_("*** Get it here: https://github.com/pyload/pyload/releases ***"))
- r = self.info["pyload"] = True
- self.info["version"] = newversion
+ r = self.info['pyload'] = True
+ self.info['version'] = newversion
return r
@threaded
def _updatePlugins(self, updates):
""" check for plugin updates """
- if self.info["plugins"]:
+ if self.info['plugins']:
return False #: plugins were already updated
updated = []
@@ -152,9 +152,9 @@ class UpdateManager(Hook):
data = sorted(map(lambda x: dict(zip(schema, x.split('|'))), updates), key=itemgetter("type", "name"))
for plugin in data:
- filename = plugin["name"]
- prefix = plugin["type"]
- version = plugin["version"]
+ filename = plugin['name']
+ prefix = plugin['type']
+ version = plugin['version']
if filename.endswith(".pyc"):
name = filename[:filename.find("_")]
@@ -169,7 +169,7 @@ class UpdateManager(Hook):
plugins = getattr(self.core.pluginManager, "%sPlugins" % type)
- oldver = float(plugins[name]["v"]) if name in plugins else None
+ oldver = float(plugins[name]['v']) if name in plugins else None
newver = float(version)
if not oldver:
@@ -213,7 +213,7 @@ class UpdateManager(Hook):
self.logInfo(_("Plugins updated and reloaded"))
else:
self.logInfo(_("*** Plugins have been updated, pyLoad will be restarted now ***"))
- self.info["plugins"] = True
+ self.info['plugins'] = True
self.scheduler.addJob(4, self.core.api.restart(), threaded=False) #: risky, but pyload doesn't let more
return True
else:
diff --git a/module/plugins/hooks/XFileSharingPro.py b/module/plugins/hooks/XFileSharingPro.py
index 09d035e10..37a464b33 100644
--- a/module/plugins/hooks/XFileSharingPro.py
+++ b/module/plugins/hooks/XFileSharingPro.py
@@ -64,8 +64,8 @@ class XFileSharingPro(Hook):
#self.logDebug(regexp)
dict = self.core.pluginManager.hosterPlugins['XFileSharingPro']
- dict["pattern"] = regexp
- dict["re"] = re.compile(regexp)
+ dict['pattern'] = regexp
+ dict['re'] = re.compile(regexp)
self.logDebug("Pattern loaded - handling %d hosters" % len(hosterList))
def getConfigSet(self, option):
@@ -74,5 +74,5 @@ class XFileSharingPro(Hook):
def unload(self):
dict = self.core.pluginManager.hosterPlugins['XFileSharingPro']
- dict["pattern"] = r"^unmatchable$"
- dict["re"] = re.compile(r"^unmatchable$")
+ dict['pattern'] = r'^unmatchable$'
+ dict['re'] = re.compile(r'^unmatchable$')
diff --git a/module/plugins/hooks/XMPPInterface.py b/module/plugins/hooks/XMPPInterface.py
index 57a997a4b..a60d31b89 100644
--- a/module/plugins/hooks/XMPPInterface.py
+++ b/module/plugins/hooks/XMPPInterface.py
@@ -121,9 +121,7 @@ class XMPPInterface(IRCInterface, JabberClient):
The handlers returned will be called when matching message is received
in a client session."""
- return [
- ("normal", self.message),
- ]
+ return [("normal", self.message)]
def message(self, stanza):
"""Message handler for the component."""
@@ -231,9 +229,7 @@ class VersionHandler(object):
def get_iq_get_handlers(self):
"""Return list of tuples (element_name, namespace, handler) describing
handlers of <iq type='get'/> stanzas"""
- return [
- ("query", "jabber:iq:version", self.get_version),
- ]
+ return [("query", "jabber:iq:version", self.get_version)]
def get_iq_set_handlers(self):
"""Return empty list, as this class provides no <iq type='set'/> stanza handler."""