diff options
| author |  Stefano <l.stickell@yahoo.it>
| 2013-07-15 22:07:29 +0200 |
|---|---|---|
| committer | Stefano <l.stickell@yahoo.it>
| 2013-07-15 22:19:20 +0200 |
| commit | dbd7a02ab03dcc97a6d0eb0c6fcc95a75a63cc6d (patch) | |
| tree | 1a8eb35d68b6acee217882487fcc413211ac7083 /pyload/plugins/hoster/UploadedTo.py | |
| parent | fixed user deletion (diff) | |
| download | pyload-dbd7a02ab03dcc97a6d0eb0c6fcc95a75a63cc6d.tar.xz | |
Using CaptchaService to make them works on 0.5
(cherry picked from commit dd30ed8ae9f9ba1472d1ff9721d626dcc39b12fd)
Conflicts:
pyload/plugins/hoster/EgoFilesCom.py
pyload/plugins/hoster/FreakshareCom.py
pyload/plugins/hoster/LuckyShareNet.py
pyload/plugins/hoster/UploadedTo.py
Diffstat (limited to 'pyload/plugins/hoster/UploadedTo.py')
| -rw-r--r-- | pyload/plugins/hoster/UploadedTo.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/pyload/plugins/hoster/UploadedTo.py b/pyload/plugins/hoster/UploadedTo.py index 5aa08891e..8285ef474 100644 --- a/pyload/plugins/hoster/UploadedTo.py +++ b/pyload/plugins/hoster/UploadedTo.py @@ -11,7 +11,12 @@ from module.utils import html_unescape, parseFileSize, chunks from module.plugins.Hoster import Hoster from module.network.RequestFactory import getURL +<<<<<<< HEAD:pyload/plugins/hoster/UploadedTo.py from module.plugins.ReCaptcha import ReCaptcha +======= +from module.plugins.Plugin import chunks +from module.plugins.internal.CaptchaService import ReCaptcha +>>>>>>> dd30ed8... Using CaptchaService to make them works on 0.5:module/plugins/hoster/UploadedTo.py key = "bGhGMkllZXByd2VEZnU5Y2NXbHhYVlZ5cEE1bkEzRUw=".decode('base64') |