summaryrefslogtreecommitdiffstats
path: root/module/plugins/hoster
diff options
context:
space:
mode:
Diffstat (limited to 'module/plugins/hoster')
-rw-r--r--module/plugins/hoster/BezvadataCz.py2
-rw-r--r--module/plugins/hoster/DailymotionCom.py2
-rw-r--r--module/plugins/hoster/FileSharkPl.py2
-rw-r--r--module/plugins/hoster/FshareVn.py2
-rw-r--r--module/plugins/hoster/Keep2ShareCc.py2
-rw-r--r--module/plugins/hoster/NitroflareCom.py4
-rw-r--r--module/plugins/hoster/ShareonlineBiz.py5
-rw-r--r--module/plugins/hoster/TurbobitNet.py4
-rw-r--r--module/plugins/hoster/VimeoCom.py2
-rw-r--r--module/plugins/hoster/XFileSharingPro.py4
-rw-r--r--module/plugins/hoster/YoutubeCom.py1
11 files changed, 15 insertions, 15 deletions
diff --git a/module/plugins/hoster/BezvadataCz.py b/module/plugins/hoster/BezvadataCz.py
index 8d56f1ff6..aece7813d 100644
--- a/module/plugins/hoster/BezvadataCz.py
+++ b/module/plugins/hoster/BezvadataCz.py
@@ -88,7 +88,7 @@ class BezvadataCz(SimpleHoster):
def loadcaptcha(self, data, *args, **kwargs):
- return data.decode("base64")
+ return data.decode('base64')
getInfo = create_getInfo(BezvadataCz)
diff --git a/module/plugins/hoster/DailymotionCom.py b/module/plugins/hoster/DailymotionCom.py
index dc42d1f60..cf75af3d2 100644
--- a/module/plugins/hoster/DailymotionCom.py
+++ b/module/plugins/hoster/DailymotionCom.py
@@ -86,7 +86,7 @@ class DailymotionCom(Hoster):
def getLink(self, streams, quality):
if quality > 0:
- for x, s in reversed([item for item in enumerate(streams)]):
+ for x, s in [item for item in enumerate(streams)][::-1]:
qf = s[0][1]
if qf <= quality:
idx = x
diff --git a/module/plugins/hoster/FileSharkPl.py b/module/plugins/hoster/FileSharkPl.py
index 252270c4b..e4ce711bd 100644
--- a/module/plugins/hoster/FileSharkPl.py
+++ b/module/plugins/hoster/FileSharkPl.py
@@ -127,7 +127,7 @@ class FileSharkPl(SimpleHoster):
def _decode64(self, data, *args, **kwargs):
- return data.decode("base64")
+ return data.decode('base64')
getInfo = create_getInfo(FileSharkPl)
diff --git a/module/plugins/hoster/FshareVn.py b/module/plugins/hoster/FshareVn.py
index 4912974ad..9a2b0c323 100644
--- a/module/plugins/hoster/FshareVn.py
+++ b/module/plugins/hoster/FshareVn.py
@@ -87,7 +87,7 @@ class FshareVn(SimpleHoster):
m = re.search(self.LINK_FREE_PATTERN, self.html)
if m is None:
self.error(_("LINK_FREE_PATTERN not found"))
-
+
self.link = m.group(1)
self.wait()
diff --git a/module/plugins/hoster/Keep2ShareCc.py b/module/plugins/hoster/Keep2ShareCc.py
index 34bc3de54..6b7b422c5 100644
--- a/module/plugins/hoster/Keep2ShareCc.py
+++ b/module/plugins/hoster/Keep2ShareCc.py
@@ -57,7 +57,7 @@ class Keep2ShareCc(SimpleHoster):
# string to time convert courtesy of https://stackoverflow.com/questions/10663720
ftr = [3600, 60, 1]
- wait_time = sum([a * b for a, b in zip(ftr, map(int, m.group(1).split(':')))])
+ wait_time = sum(a * b for a, b in zip(ftr, map(int, m.group(1).split(':'))))
self.wantReconnect = True
self.retry(wait_time=wait_time, reason="Please wait to download this file")
diff --git a/module/plugins/hoster/NitroflareCom.py b/module/plugins/hoster/NitroflareCom.py
index e21d067b3..434d130ce 100644
--- a/module/plugins/hoster/NitroflareCom.py
+++ b/module/plugins/hoster/NitroflareCom.py
@@ -49,8 +49,8 @@ class NitroflareCom(SimpleHoster):
elif hasattr(self, 'WAIT_PATTERN'):
m = re.search(self.WAIT_PATTERN, self.html)
if m:
- wait_time = sum([int(v) * {"hr": 3600, "hour": 3600, "min": 60, "sec": 1}[u.lower()] for v, u in
- re.findall(r'(\d+)\s*(hr|hour|min|sec)', m.group(0), re.I)])
+ wait_time = sum(int(v) * {"hr": 3600, "hour": 3600, "min": 60, "sec": 1}[u.lower()] for v, u in
+ re.findall(r'(\d+)\s*(hr|hour|min|sec)', m.group(0), re.I))
self.wait(wait_time, wait_time > 300)
return
diff --git a/module/plugins/hoster/ShareonlineBiz.py b/module/plugins/hoster/ShareonlineBiz.py
index 6f49711b8..e00bf5ada 100644
--- a/module/plugins/hoster/ShareonlineBiz.py
+++ b/module/plugins/hoster/ShareonlineBiz.py
@@ -97,9 +97,8 @@ class ShareonlineBiz(SimpleHoster):
self.checkErrors()
- res = self.handleCaptcha()
-
- download_url = res.decode("base64")
+ res = self.handleCaptcha()
+ download_url = res.decode('base64')
if not download_url.startswith("http://"):
self.error(_("Wrong download url"))
diff --git a/module/plugins/hoster/TurbobitNet.py b/module/plugins/hoster/TurbobitNet.py
index 03e18a9cd..fbd054713 100644
--- a/module/plugins/hoster/TurbobitNet.py
+++ b/module/plugins/hoster/TurbobitNet.py
@@ -140,7 +140,7 @@ class TurbobitNet(SimpleHoster):
self.logDebug("URL", self.js.engine, out)
if out.startswith('/download/'):
return "http://turbobit.net%s" % out.strip()
-
+
except Exception, e:
self.logError(e)
else:
@@ -149,7 +149,7 @@ class TurbobitNet(SimpleHoster):
self.delStorage("rtUpdate")
else:
self.retry()
-
+
self.wait()
diff --git a/module/plugins/hoster/VimeoCom.py b/module/plugins/hoster/VimeoCom.py
index f7485f025..d427c1511 100644
--- a/module/plugins/hoster/VimeoCom.py
+++ b/module/plugins/hoster/VimeoCom.py
@@ -44,7 +44,7 @@ class VimeoCom(SimpleHoster):
html = self.load("https://player.vimeo.com/video/" + self.info['pattern']['ID'], get={'password': password})
pattern = r'"(?P<QL>\w+)":{"profile".*?"(?P<URL>http://pdl\.vimeocdn\.com.+?)"'
- link = dict([(l.group('QL').lower(), l.group('URL')) for l in re.finditer(pattern, html)])
+ link = dict((l.group('QL').lower(), l.group('URL')) for l in re.finditer(pattern, html))
if self.getConfig("original"):
if "original" in link:
diff --git a/module/plugins/hoster/XFileSharingPro.py b/module/plugins/hoster/XFileSharingPro.py
index 1794ae513..c66f25ad4 100644
--- a/module/plugins/hoster/XFileSharingPro.py
+++ b/module/plugins/hoster/XFileSharingPro.py
@@ -21,7 +21,7 @@ class XFileSharingPro(XFSHoster):
def _log(self, type, args):
- msg = " | ".join([str(a).strip() for a in args if a])
+ msg = " | ".join(str(a).strip() for a in args if a)
logger = getattr(self.log, type)
logger("%s: %s: %s" % (self.__name__, self.HOSTER_NAME, msg or _("%s MARK" % type.upper())))
@@ -32,7 +32,7 @@ class XFileSharingPro(XFSHoster):
self.__pattern__ = self.core.pluginManager.hosterPlugins[self.__name__]['pattern']
self.HOSTER_DOMAIN = re.match(self.__pattern__, self.pyfile.url).group("DOMAIN").lower()
- self.HOSTER_NAME = "".join([part.capitalize() for part in re.split(r'(\.|\d+)', self.HOSTER_DOMAIN) if part != '.'])
+ self.HOSTER_NAME = "".join(part.capitalize() for part in re.split(r'(\.|\d+)', self.HOSTER_DOMAIN) if part != '.')
if self.HOSTER_NAME[0].isdigit():
self.HOSTER_NAME = 'X' + self.HOSTER_NAME
diff --git a/module/plugins/hoster/YoutubeCom.py b/module/plugins/hoster/YoutubeCom.py
index 5c2489d3c..d00bf2a0e 100644
--- a/module/plugins/hoster/YoutubeCom.py
+++ b/module/plugins/hoster/YoutubeCom.py
@@ -189,4 +189,5 @@ class YoutubeCom(Hoster):
"-vcodec", "copy",
"-acodec", "copy",
filename])
+
os.remove(inputfile)