diff options
| author |  Walter Purcaro <vuolter@users.noreply.github.com>
| 2015-05-12 17:21:33 +0200 |
|---|---|---|
| committer | Walter Purcaro <vuolter@users.noreply.github.com>
| 2015-05-12 17:21:33 +0200 |
| commit | 0c525f750dad3f57297836ddea02da7d42ad5969 (patch) | |
| tree | 2df5f1cd3fb29c71386e197ab782a7385b8e42bd /pyload/webui/app | |
| parent | Merge branch 'stable' into 0.4.10 (diff) | |
| download | pyload-0c525f750dad3f57297836ddea02da7d42ad5969.tar.xz | |
Other import fixes (4)
Diffstat (limited to 'pyload/webui/app')
| -rw-r--r-- | pyload/webui/app/cnl.py | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/pyload/webui/app/cnl.py b/pyload/webui/app/cnl.py index 465e087e5..07b966f5e 100644 --- a/pyload/webui/app/cnl.py +++ b/pyload/webui/app/cnl.py @@ -8,20 +8,14 @@ import os import re import urllib +import Crypto import bottle from pyload.webui import PYLOAD, DL_ROOT, JS -try: - from Crypto.Cipher import AES -except Exception: - pass - - def local_check(function): - def _view(*args, **kwargs): if request.environ.get("REMOTE_ADDR", "0") in ("127.0.0.1", "localhost") \ or request.environ.get("HTTP_HOST", "0") in ("127.0.0.1:9666", "localhost:9666"): @@ -105,7 +99,7 @@ def addcrypted2(): IV = Key - obj = AES.new(Key, AES.MODE_CBC, IV) + obj = Crypto.Cipher.AES.new(Key, Crypto.Cipher.AES.MODE_CBC, IV) result = obj.decrypt(crypted).replace("\x00", "").replace("\r", "").split("\n") result = filter(lambda x: x != "", result) |