diff options
| author |  Walter Purcaro <vuolter@gmail.com>
| 2014-09-08 01:08:03 +0200 |
|---|---|---|
| committer | Walter Purcaro <vuolter@gmail.com>
| 2014-09-14 11:03:20 +0200 |
| commit | 91115fd577f20704ef7f2e74c4527ffbb0730a09 (patch) | |
| tree | 198fc68f1eb6f42e220d0f1c68499f48ae70543c /pyload/webui | |
| parent | Project __init__ with info (diff) | |
| download | pyload-91115fd577f20704ef7f2e74c4527ffbb0730a09.tar.xz | |
Restructure pyload file tree (1)
Diffstat (limited to 'pyload/webui')
| -rw-r--r-- | pyload/webui/__init__.py | 6 | ||||
| -rw-r--r-- | pyload/webui/app/api.py | 4 | ||||
| -rw-r--r-- | pyload/webui/app/utils.py | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/pyload/webui/__init__.py b/pyload/webui/__init__.py index c421b632e..6173c57df 100644 --- a/pyload/webui/__init__.py +++ b/pyload/webui/__init__.py @@ -17,7 +17,7 @@ """ import sys -import pyload.common.pylgettext as gettext +import pyload.utils.pylgettext as gettext import os from os.path import join, abspath, dirname, exists @@ -40,7 +40,7 @@ from middlewares import StripPathMiddleware, GZipMiddleWare, PrefixMiddleware SETUP = None PYLOAD = None -from pyload.threads import ServerThread +from pyload.manager.thread import ServerThread if not ServerThread.core: if ServerThread.setup: @@ -52,7 +52,7 @@ else: PYLOAD = ServerThread.core.api config = ServerThread.core.config -from pyload.common.JsEngine import JsEngine +from pyload.utils.JsEngine import JsEngine JS = JsEngine() diff --git a/pyload/webui/app/api.py b/pyload/webui/app/api.py index 7050b78dc..286061c2a 100644 --- a/pyload/webui/app/api.py +++ b/pyload/webui/app/api.py @@ -9,9 +9,9 @@ from bottle import route, request, response, HTTPError from utils import toDict, set_session from pyload.webui import PYLOAD -from pyload.common.json_layer import json +from pyload.utils import json from SafeEval import const_eval as literal_eval -from pyload.Api import BaseObject +from pyload.api import BaseObject # json encoder that accepts TBase objects class TBaseEncoder(json.JSONEncoder): diff --git a/pyload/webui/app/utils.py b/pyload/webui/app/utils.py index 895696c19..d5fa66a35 100644 --- a/pyload/webui/app/utils.py +++ b/pyload/webui/app/utils.py @@ -22,7 +22,7 @@ from bottle import request, HTTPError, redirect, ServerAdapter from pyload.webui import env, THEME -from pyload.Api import has_permission, PERMS, ROLE +from pyload.api import has_permission, PERMS, ROLE def render_to_response(file, args={}, proc=[]): for p in proc: |