summaryrefslogtreecommitdiffstats
path: root/pyload/webui/app
diff options
context:
space:
mode:
Diffstat (limited to 'pyload/webui/app')
-rw-r--r--pyload/webui/app/__init__.py2
-rw-r--r--pyload/webui/app/pyload.py (renamed from pyload/webui/app/pyloadweb.py)2
-rw-r--r--pyload/webui/app/utils.py2
3 files changed, 2 insertions, 4 deletions
diff --git a/pyload/webui/app/__init__.py b/pyload/webui/app/__init__.py
index 43c9ecbe9..39d0fadd5 100644
--- a/pyload/webui/app/__init__.py
+++ b/pyload/webui/app/__init__.py
@@ -1,3 +1,3 @@
# -*- coding: utf-8 -*-
-from pyload.webui.app import api, cnl, json, pyloadweb
+from pyload.webui.app import api, cnl, json, pyload
diff --git a/pyload/webui/app/pyloadweb.py b/pyload/webui/app/pyload.py
index 27532b86e..58acdf12c 100644
--- a/pyload/webui/app/pyloadweb.py
+++ b/pyload/webui/app/pyload.py
@@ -15,7 +15,7 @@ from pyload.webui import PYLOAD, PYLOAD_DIR, THEME_DIR, THEME, SETUP, env
from pyload.webui.app.utils import render_to_response, parse_permissions, parse_userdata, \
login_required, get_permission, set_permission, permlist, toDict, set_session
-from pyload.webui.filters import relpath, unquotepath
+from pyload.utils.filters import relpath, unquotepath
from pyload.utils import formatSize, fs_join, fs_encode, fs_decode
diff --git a/pyload/webui/app/utils.py b/pyload/webui/app/utils.py
index 3526f2615..2e7cf76c5 100644
--- a/pyload/webui/app/utils.py
+++ b/pyload/webui/app/utils.py
@@ -86,10 +86,8 @@ def parse_userdata(session):
def login_required(perm=None):
-
def _dec(func):
-
def _view(*args, **kwargs):
s = request.environ.get('beaker.session')
if s.get("name", None) and s.get("authenticated", False):