diff options
| author |  Walter Purcaro <vuolter@users.noreply.github.com>
| 2015-04-12 19:23:51 +0200 |
|---|---|---|
| committer | Walter Purcaro <vuolter@users.noreply.github.com>
| 2015-04-12 19:23:51 +0200 |
| commit | f0afbee15380bf5fc242fb3dd5439a9ea9c67d5c (patch) | |
| tree | 7e82c022c157a39232fc590ab2ffa69787f5d260 /pyload/plugin/crypter | |
| parent | Cleanup (diff) | |
| parent | import fixes + code-cleanup (diff) | |
| download | pyload-f0afbee15380bf5fc242fb3dd5439a9ea9c67d5c.tar.xz | |
Merge branch 'pr/n3_ardi69' into 0.4.10
Conflicts:
pyload/plugin/Plugin.py
pyload/webui/app/pyloadweb.py
Diffstat (limited to 'pyload/plugin/crypter')
| -rw-r--r-- | pyload/plugin/crypter/NCryptIn.py | 2 | ||||
| -rw-r--r-- | pyload/plugin/crypter/SafelinkingNet.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pyload/plugin/crypter/NCryptIn.py b/pyload/plugin/crypter/NCryptIn.py index 94808db3b..02427190e 100644 --- a/pyload/plugin/crypter/NCryptIn.py +++ b/pyload/plugin/crypter/NCryptIn.py @@ -6,7 +6,7 @@ import re from Crypto.Cipher import AES from pyload.plugin.Crypter import Crypter -from pyload.plugin.internal.captcha import ReCaptcha +from pyload.plugin.captcha.ReCaptcha import ReCaptcha class NCryptIn(Crypter): diff --git a/pyload/plugin/crypter/SafelinkingNet.py b/pyload/plugin/crypter/SafelinkingNet.py index 0c93d6919..a949d17b1 100644 --- a/pyload/plugin/crypter/SafelinkingNet.py +++ b/pyload/plugin/crypter/SafelinkingNet.py @@ -6,7 +6,7 @@ from BeautifulSoup import BeautifulSoup from pyload.utils import json_loads from pyload.plugin.Crypter import Crypter -from pyload.plugin.internal.captcha import SolveMedia +from pyload.plugin.captcha.SolveMedia import SolveMedia class SafelinkingNet(Crypter): |