diff options
| author |  Walter Purcaro <vuolter@gmail.com>
| 2014-12-07 15:34:19 +0100 |
|---|---|---|
| committer | Walter Purcaro <vuolter@gmail.com>
| 2014-12-07 15:34:19 +0100 |
| commit | d8771b13f1c658ac726ac93195a48ad87169eccd (patch) | |
| tree | a81899c2905d59ff20341ffcad35c949d880a0b4 /pyload/plugins/crypter/RelinkUs.py | |
| parent | Tiny code cosmetics (diff) | |
| parent | [SkipRev] Tiny fixup (diff) | |
| download | pyload-d8771b13f1c658ac726ac93195a48ad87169eccd.tar.xz | |
Merge branch 'stable' into 0.4.10
Conflicts:
module/plugins/hoster/NowDownloadEu.py
module/plugins/hoster/NowDownloadSx.py
module/plugins/hoster/NowVideoAt.py
module/plugins/hoster/NowVideoSx.py
pyload/plugins/account/RapidshareCom.py
pyload/plugins/addon/ExtractArchive.py
pyload/plugins/addon/HotFolder.py
pyload/plugins/addon/UpdateManager.py
pyload/plugins/hook/Captcha9kw.py
pyload/plugins/hook/DebridItaliaCom.py
pyload/plugins/hoster/DebridItaliaCom.py
pyload/plugins/hoster/Keep2shareCc.py
pyload/plugins/hoster/NetloadIn.py
pyload/plugins/hoster/NowDownloadEu.py
pyload/plugins/hoster/NowVideoAt.py
pyload/plugins/hoster/RapidshareCom.py
pyload/plugins/hoster/ShareonlineBiz.py
pyload/plugins/internal/MultiHoster.py
pyload/plugins/internal/SimpleHoster.py
Diffstat (limited to 'pyload/plugins/crypter/RelinkUs.py')
| -rw-r--r-- | pyload/plugins/crypter/RelinkUs.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pyload/plugins/crypter/RelinkUs.py b/pyload/plugins/crypter/RelinkUs.py index 419ce4506..c5e312f93 100644 --- a/pyload/plugins/crypter/RelinkUs.py +++ b/pyload/plugins/crypter/RelinkUs.py @@ -1,5 +1,7 @@ # -*- coding: utf-8 -*- +from __future__ import with_statement + import base64 import binascii import re @@ -12,7 +14,7 @@ from pyload.plugins.internal.Crypter import Crypter class RelinkUs(Crypter): __name__ = "RelinkUs" __type__ = "crypter" - __version__ = "3.1" + __version__ = "3.11" __pattern__ = r'http://(?:www\.)?relink\.us/(f/|((view|go)\.php\?id=))(?P<id>.+)' __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), |