diff options
author | 2014-04-11 12:18:22 +0200 | |
---|---|---|
committer | 2014-04-11 12:18:22 +0200 | |
commit | d68938a9a7fbfb079b0a6de469de766b5892d769 (patch) | |
tree | 443b21cc277126fa44486bc940f8aa521f92564d /module/plugins/container | |
parent | Use wait to set time in SimpleHoster plugins (diff) | |
download | pyload-d68938a9a7fbfb079b0a6de469de766b5892d769.tar.xz |
Remove bad whitespaces
Merges vuolter/pyload@e4b2562
Diffstat (limited to 'module/plugins/container')
-rw-r--r-- | module/plugins/container/CCF.py | 4 | ||||
-rw-r--r-- | module/plugins/container/LinkList.py | 20 | ||||
-rw-r--r-- | module/plugins/container/RSDF.py | 3 |
3 files changed, 13 insertions, 14 deletions
diff --git a/module/plugins/container/CCF.py b/module/plugins/container/CCF.py index eb5bacab3..781e2be45 100644 --- a/module/plugins/container/CCF.py +++ b/module/plugins/container/CCF.py @@ -19,7 +19,7 @@ class CCF(Container): __author_mail__ = "Willnix@pyload.org" def decrypt(self, pyfile): - + infile = pyfile.url.replace("\n", "") opener = build_opener(MultipartPostHandler) @@ -32,7 +32,7 @@ class CCF(Container): location = download_folder #join(download_folder, self.pyfile.package().folder.decode(sys.getfilesystemencoding())) if not exists(location): makedirs(location) - + tempdlc_name = join(location, "tmp_%s.dlc" % pyfile.name) tempdlc = open(tempdlc_name, "w") tempdlc.write(re.search(r'<dlc>(.*)</dlc>', tempdlc_content, re.DOTALL).group(1)) diff --git a/module/plugins/container/LinkList.py b/module/plugins/container/LinkList.py index 6baf9f55d..90ff40d20 100644 --- a/module/plugins/container/LinkList.py +++ b/module/plugins/container/LinkList.py @@ -20,22 +20,22 @@ class LinkList(Container): file_enc = codecs.lookup(self.getConfig("encoding")).name except: file_enc = "utf-8" - + print repr(pyfile.url) print pyfile.url - + file_name = fs_encode(pyfile.url) - + txt = codecs.open(file_name, 'r', file_enc) links = txt.readlines() curPack = "Parsed links from %s" % pyfile.name - + packages = {curPack:[],} - + for link in links: link = link.strip() if not link: continue - + if link.startswith(";"): continue if link.startswith("[") and link.endswith("]"): @@ -45,15 +45,15 @@ class LinkList(Container): continue packages[curPack].append(link) txt.close() - + # empty packages fix delete = [] - + for key,value in packages.iteritems(): if not value: delete.append(key) - + for key in delete: del packages[key] @@ -63,6 +63,6 @@ class LinkList(Container): txt.close() except: self.log.warning(_("LinkList could not be cleared.")) - + for name, links in packages.iteritems(): self.packages.append((name, links, name)) diff --git a/module/plugins/container/RSDF.py b/module/plugins/container/RSDF.py index 136024fa3..c9721533e 100644 --- a/module/plugins/container/RSDF.py +++ b/module/plugins/container/RSDF.py @@ -15,9 +15,8 @@ class RSDF(Container): __author_name__ = ("RaNaN", "spoob") __author_mail__ = ("RaNaN@pyload.org", "spoob@pyload.org") - def decrypt(self, pyfile): - + from Crypto.Cipher import AES infile = pyfile.url.replace("\n", "") |