summaryrefslogtreecommitdiffstats
path: root/module/plugins/internal
diff options
context:
space:
mode:
authorGravatar Walter Purcaro <vuolter@users.noreply.github.com> 2015-03-10 01:55:52 +0100
committerGravatar Walter Purcaro <vuolter@users.noreply.github.com> 2015-03-10 01:55:52 +0100
commit7beb65e991bc6d1913c3b5bb2ef69e659d5b8342 (patch)
treee076082f6cb799a820eee287c47f24f082b3a41c /module/plugins/internal
parent[DDLMusicOrg] Removed (diff)
downloadpyload-7beb65e991bc6d1913c3b5bb2ef69e659d5b8342.tar.xz
Spare code cosmetics
Diffstat (limited to 'module/plugins/internal')
-rw-r--r--module/plugins/internal/Extractor.py6
-rw-r--r--module/plugins/internal/SevenZip.py4
-rw-r--r--module/plugins/internal/SimpleCrypter.py6
-rw-r--r--module/plugins/internal/SimpleHoster.py10
-rw-r--r--module/plugins/internal/UnRar.py6
-rw-r--r--module/plugins/internal/XFSAccount.py4
-rw-r--r--module/plugins/internal/XFSHoster.py8
7 files changed, 22 insertions, 22 deletions
diff --git a/module/plugins/internal/Extractor.py b/module/plugins/internal/Extractor.py
index 4b21cc49c..79864818e 100644
--- a/module/plugins/internal/Extractor.py
+++ b/module/plugins/internal/Extractor.py
@@ -23,9 +23,9 @@ class Extractor:
__description__ = """Base extractor plugin"""
__license__ = "GPLv3"
- __authors__ = [("RaNaN", "ranan@pyload.org"),
+ __authors__ = [("RaNaN" , "ranan@pyload.org" ),
("Walter Purcaro", "vuolter@gmail.com"),
- ("Immenz", "immenz@gmx.net")]
+ ("Immenz" , "immenz@gmx.net" )]
EXTENSIONS = []
@@ -40,7 +40,7 @@ class Extractor:
@classmethod
- def isMultipart(cls,filename):
+ def isMultipart(cls, filename):
return False
diff --git a/module/plugins/internal/SevenZip.py b/module/plugins/internal/SevenZip.py
index 82901f8cc..482b1802c 100644
--- a/module/plugins/internal/SevenZip.py
+++ b/module/plugins/internal/SevenZip.py
@@ -14,7 +14,7 @@ class SevenZip(UnRar):
__description__ = """7-Zip extractor plugin"""
__license__ = "GPLv3"
- __authors__ = [("Michael Nowak", ""),
+ __authors__ = [("Michael Nowak" , "" ),
("Walter Purcaro", "vuolter@gmail.com")]
@@ -41,7 +41,7 @@ class SevenZip(UnRar):
if os.name == "nt":
cls.CMD = os.path.join(pypath, "7z.exe")
p = subprocess.Popen([cls.CMD], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
- out,err = p.communicate()
+ out, err = p.communicate()
else:
p = subprocess.Popen([cls.CMD], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
out, err = p.communicate()
diff --git a/module/plugins/internal/SimpleCrypter.py b/module/plugins/internal/SimpleCrypter.py
index 856b548f0..696cc0848 100644
--- a/module/plugins/internal/SimpleCrypter.py
+++ b/module/plugins/internal/SimpleCrypter.py
@@ -20,9 +20,9 @@ class SimpleCrypter(Crypter, SimpleHoster):
__description__ = """Simple decrypter plugin"""
__license__ = "GPLv3"
- __authors__ = [("stickell", "l.stickell@yahoo.it"),
- ("zoidberg", "zoidberg@mujmail.cz"),
- ("Walter Purcaro", "vuolter@gmail.com")]
+ __authors__ = [("stickell" , "l.stickell@yahoo.it"),
+ ("zoidberg" , "zoidberg@mujmail.cz"),
+ ("Walter Purcaro", "vuolter@gmail.com" )]
"""
diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py
index 0adfc64b3..df6e78485 100644
--- a/module/plugins/internal/SimpleHoster.py
+++ b/module/plugins/internal/SimpleHoster.py
@@ -153,11 +153,11 @@ def getFileURL(self, url, follow_location=None):
for i in xrange(redirect):
try:
self.logDebug("Redirect #%d to: %s" % (i, url))
- header = self.load(url, ref=True, cookies=True, just_header=True, decode=True)
+ header = self.load(url, just_header=True, decode=True)
except Exception: #: Bad bad bad...
req = pyreq.getHTTPRequest()
- res = req.load(url, cookies=True, just_header=True, decode=True)
+ res = req.load(url, just_header=True, decode=True)
req.close()
@@ -252,9 +252,9 @@ class SimpleHoster(Hoster):
__description__ = """Simple hoster plugin"""
__license__ = "GPLv3"
- __authors__ = [("zoidberg", "zoidberg@mujmail.cz"),
- ("stickell", "l.stickell@yahoo.it"),
- ("Walter Purcaro", "vuolter@gmail.com")]
+ __authors__ = [("zoidberg" , "zoidberg@mujmail.cz"),
+ ("stickell" , "l.stickell@yahoo.it"),
+ ("Walter Purcaro", "vuolter@gmail.com" )]
"""
diff --git a/module/plugins/internal/UnRar.py b/module/plugins/internal/UnRar.py
index 45e1640bf..2ba6ff90d 100644
--- a/module/plugins/internal/UnRar.py
+++ b/module/plugins/internal/UnRar.py
@@ -26,9 +26,9 @@ class UnRar(Extractor):
__description__ = """Rar extractor plugin"""
__license__ = "GPLv3"
- __authors__ = [("RaNaN", "RaNaN@pyload.org"),
+ __authors__ = [("RaNaN" , "RaNaN@pyload.org" ),
("Walter Purcaro", "vuolter@gmail.com"),
- ("Immenz", "immenz@gmx.net"),]
+ ("Immenz" , "immenz@gmx.net" )]
CMD = "unrar"
@@ -79,7 +79,7 @@ class UnRar(Extractor):
@classmethod
- def isMultipart(cls,filename):
+ def isMultipart(cls, filename):
multipart = cls.re_multipart.search(filename)
if multipart:
# First Multipart file (part1.rar for *.part1-9.rar format or *.rar for .r1-9 format) handled as normal Archive
diff --git a/module/plugins/internal/XFSAccount.py b/module/plugins/internal/XFSAccount.py
index 845ea3230..9315fb68f 100644
--- a/module/plugins/internal/XFSAccount.py
+++ b/module/plugins/internal/XFSAccount.py
@@ -16,8 +16,8 @@ class XFSAccount(Account):
__description__ = """XFileSharing account plugin"""
__license__ = "GPLv3"
- __authors__ = [("zoidberg", "zoidberg@mujmail.cz"),
- ("Walter Purcaro", "vuolter@gmail.com")]
+ __authors__ = [("zoidberg" , "zoidberg@mujmail.cz"),
+ ("Walter Purcaro", "vuolter@gmail.com" )]
HOSTER_DOMAIN = None
diff --git a/module/plugins/internal/XFSHoster.py b/module/plugins/internal/XFSHoster.py
index c4fc969ba..e0c6d8824 100644
--- a/module/plugins/internal/XFSHoster.py
+++ b/module/plugins/internal/XFSHoster.py
@@ -22,9 +22,9 @@ class XFSHoster(SimpleHoster):
__description__ = """XFileSharing hoster plugin"""
__license__ = "GPLv3"
- __authors__ = [("zoidberg", "zoidberg@mujmail.cz"),
- ("stickell", "l.stickell@yahoo.it"),
- ("Walter Purcaro", "vuolter@gmail.com")]
+ __authors__ = [("zoidberg" , "zoidberg@mujmail.cz"),
+ ("stickell" , "l.stickell@yahoo.it"),
+ ("Walter Purcaro", "vuolter@gmail.com" )]
HOSTER_DOMAIN = None
@@ -103,7 +103,7 @@ class XFSHoster(SimpleHoster):
self.req.http.c.setopt(FOLLOWLOCATION, 0)
- self.html = self.load(pyfile.url, post=data, ref=True, decode=True)
+ self.html = self.load(pyfile.url, post=data, decode=True)
self.req.http.c.setopt(FOLLOWLOCATION, 1)