diff options
| author |  Walter Purcaro <vuolter@gmail.com>
| 2014-04-11 12:18:22 +0200 |
|---|---|---|
| committer |  Stefano <l.stickell@yahoo.it>
| 2014-04-21 17:20:41 +0200 |
| commit | 2069392beb3e8175c3bb7118535ef4475817d420 (patch) | |
| tree | eade5e6edec1d14a905863367b34c8f2e0cf0171 /pyload/plugins/crypter | |
| parent | Use wait to set time in SimpleHoster plugins (diff) | |
| download | pyload-2069392beb3e8175c3bb7118535ef4475817d420.tar.xz | |
Remove bad whitespaces
Merges vuolter/pyload@e4b2562
(cherry picked from commit d68938a9a7fbfb079b0a6de469de766b5892d769)
Conflicts:
module/plugins/Account.py
module/plugins/AccountManager.py
module/plugins/Container.py
module/plugins/Crypter.py
module/plugins/Hook.py
module/plugins/Hoster.py
module/plugins/Plugin.py
module/plugins/PluginManager.py
module/plugins/ReCaptcha.py
module/plugins/captcha/GigasizeCom.py
module/plugins/captcha/LinksaveIn.py
module/plugins/container/LinkList.py
pyload/plugins/internal/OCR.py
pyload/plugins/internal/ShareonlineBizOCR.py
Diffstat (limited to 'pyload/plugins/crypter')
| -rw-r--r-- | pyload/plugins/crypter/CCF.py | 4 | ||||
| -rw-r--r-- | pyload/plugins/crypter/RSDF.py | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/pyload/plugins/crypter/CCF.py b/pyload/plugins/crypter/CCF.py index 0badf8e06..f2b33561e 100644 --- a/pyload/plugins/crypter/CCF.py +++ b/pyload/plugins/crypter/CCF.py @@ -19,7 +19,7 @@ class CCF(Crypter): __author_mail__ = "Willnix@pyload.org" def decrypt(self, pyfile): - + infile = pyfile.url.replace("\n", "") opener = build_opener(MultipartPostHandler) @@ -32,7 +32,7 @@ class CCF(Crypter): 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/pyload/plugins/crypter/RSDF.py b/pyload/plugins/crypter/RSDF.py index 46de56d8f..6440585bc 100644 --- a/pyload/plugins/crypter/RSDF.py +++ b/pyload/plugins/crypter/RSDF.py @@ -15,9 +15,8 @@ class RSDF(Crypter): __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", "") |