diff options
| author |  RaNaN <Mast3rRaNaN@hotmail.de>
| 2011-02-04 20:43:19 +0100 |
|---|---|---|
| committer | RaNaN <Mast3rRaNaN@hotmail.de>
| 2011-02-04 20:43:19 +0100 |
| commit | 0e86ad65cc532ca648d5441c4431c4f8b5ee5df5 (patch) | |
| tree | 46736838984cc8f3ae01cfe0069edc4555ad7103 /module | |
| parent | share-online.biz premium fix (diff) | |
| download | pyload-0e86ad65cc532ca648d5441c4431c4f8b5ee5df5.tar.xz | |
py 2.5 fix
Diffstat (limited to 'module')
| -rw-r--r-- | module/HookManager.py | 2 | ||||
| -rw-r--r-- | module/web/cnl_app.py | 1 | ||||
| -rw-r--r-- | module/web/webinterface.py | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/module/HookManager.py b/module/HookManager.py index 6c6c0170f..018508c51 100644 --- a/module/HookManager.py +++ b/module/HookManager.py @@ -147,4 +147,4 @@ class HookManager(): def activePlugins(self): """ returns all active plugins """ - return filter(methodcaller("isActivated"), self.plugins) + return [x for x in self.plugins if x.isActivated()] diff --git a/module/web/cnl_app.py b/module/web/cnl_app.py index 34ddc6ac2..4c8b3ed4c 100644 --- a/module/web/cnl_app.py +++ b/module/web/cnl_app.py @@ -2,7 +2,6 @@ # -*- coding: utf-8 -*- from os.path import join import re -from traceback import print_exc from urllib import unquote from base64 import standard_b64decode from binascii import unhexlify diff --git a/module/web/webinterface.py b/module/web/webinterface.py index 52488ea20..49e8e831c 100644 --- a/module/web/webinterface.py +++ b/module/web/webinterface.py @@ -73,7 +73,7 @@ JS = JsEngine() TEMPLATE = config.get('webinterface', 'template') DL_ROOT = config.get('general', 'download_folder') -LOG_ROOT = join(PYLOAD_DIR, config.get('log', 'log_folder')) +LOG_ROOT = config.get('log', 'log_folder') DEBUG = config.get("general","debug_mode") bottle.debug(DEBUG) |