diff options
| author |  Walter Purcaro <vuolter@gmail.com>
| 2014-04-11 12:16:14 +0200 |
|---|---|---|
| committer |  Stefano <l.stickell@yahoo.it>
| 2014-04-21 17:20:06 +0200 |
| commit | 6049cd30020ca03bb1193e95bc0fb860fc06e6f7 (patch) | |
| tree | 36345ebfcee2b43c13bbb994e68cfee87b9a7779 /pyload/plugins/crypter | |
| parent | Fix __config__ (diff) | |
| download | pyload-6049cd30020ca03bb1193e95bc0fb860fc06e6f7.tar.xz | |
Fix EOF
Merges vuolter/pyload@00052b2
(cherry picked from commit 12485652a14c55e102e5d073f4bf9518f5cf5f85)
Conflicts:
module/plugins/Container.py
module/plugins/Crypter.py
module/plugins/Hook.py
module/plugins/PluginManager.py
module/plugins/ReCaptcha.py
pyload/plugins/accounts/MultishareCz.py
Diffstat (limited to 'pyload/plugins/crypter')
| -rw-r--r-- | pyload/plugins/crypter/CCF.py | 1 | ||||
| -rw-r--r-- | pyload/plugins/crypter/CrockoComFolder.py | 2 | ||||
| -rw-r--r-- | pyload/plugins/crypter/CzshareComFolder.py | 2 | ||||
| -rw-r--r-- | pyload/plugins/crypter/FilebeerInfoFolder.py | 1 | ||||
| -rw-r--r-- | pyload/plugins/crypter/QuickshareCzFolder.py | 2 | ||||
| -rw-r--r-- | pyload/plugins/crypter/RSDF.py | 2 |
6 files changed, 4 insertions, 6 deletions
diff --git a/pyload/plugins/crypter/CCF.py b/pyload/plugins/crypter/CCF.py index 2bd42480d..0badf8e06 100644 --- a/pyload/plugins/crypter/CCF.py +++ b/pyload/plugins/crypter/CCF.py @@ -39,4 +39,3 @@ class CCF(Crypter): tempdlc.close() self.packages.append((tempdlc_name, [tempdlc_name], tempdlc_name)) - diff --git a/pyload/plugins/crypter/CrockoComFolder.py b/pyload/plugins/crypter/CrockoComFolder.py index 2b3b4af3c..f6778bb6f 100644 --- a/pyload/plugins/crypter/CrockoComFolder.py +++ b/pyload/plugins/crypter/CrockoComFolder.py @@ -12,4 +12,4 @@ class CrockoComFolder(SimpleCrypter): __author_name__ = "zoidberg" __author_mail__ = "zoidberg@mujmail.cz" - LINK_PATTERN = r'<td class="last"><a href="([^"]+)">download</a>'
\ No newline at end of file + LINK_PATTERN = r'<td class="last"><a href="([^"]+)">download</a>' diff --git a/pyload/plugins/crypter/CzshareComFolder.py b/pyload/plugins/crypter/CzshareComFolder.py index b908efc42..7cddcae6d 100644 --- a/pyload/plugins/crypter/CzshareComFolder.py +++ b/pyload/plugins/crypter/CzshareComFolder.py @@ -28,4 +28,4 @@ class CzshareComFolder(Crypter): if new_links: self.core.files.addLinks(new_links, self.pyfile.package().id) else: - self.fail('Could not extract any links')
\ No newline at end of file + self.fail('Could not extract any links') diff --git a/pyload/plugins/crypter/FilebeerInfoFolder.py b/pyload/plugins/crypter/FilebeerInfoFolder.py index 8a8dbd8ed..aaedf6eef 100644 --- a/pyload/plugins/crypter/FilebeerInfoFolder.py +++ b/pyload/plugins/crypter/FilebeerInfoFolder.py @@ -11,4 +11,3 @@ class FilebeerInfoFolder(DeadCrypter): __description__ = """Filebeer.info folder decrypter plugin""" __author_name__ = "zoidberg" __author_mail__ = "zoidberg@mujmail.cz" - diff --git a/pyload/plugins/crypter/QuickshareCzFolder.py b/pyload/plugins/crypter/QuickshareCzFolder.py index c24034e8f..887d9c154 100644 --- a/pyload/plugins/crypter/QuickshareCzFolder.py +++ b/pyload/plugins/crypter/QuickshareCzFolder.py @@ -28,4 +28,4 @@ class QuickshareCzFolder(Crypter): if new_links: self.core.files.addLinks(new_links, self.pyfile.package().id) else: - self.fail('Could not extract any links')
\ No newline at end of file + self.fail('Could not extract any links') diff --git a/pyload/plugins/crypter/RSDF.py b/pyload/plugins/crypter/RSDF.py index 443eaff26..46de56d8f 100644 --- a/pyload/plugins/crypter/RSDF.py +++ b/pyload/plugins/crypter/RSDF.py @@ -46,4 +46,4 @@ class RSDF(Crypter): links.append(decryptedUrl) self.log.debug("%s: adding package %s with %d links" % (self.__name__,pyfile.package().name,len(links))) - self.packages.append((pyfile.package().name, links)) + self.packages.append((pyfile.package().name, links)) |