summaryrefslogtreecommitdiffstats
path: root/module/web/api_app.py
diff options
context:
space:
mode:
authorGravatar RaNaN <Mast3rRaNaN@hotmail.de> 2012-08-10 22:12:10 +0200
committerGravatar RaNaN <Mast3rRaNaN@hotmail.de> 2012-08-10 22:12:10 +0200
commita8f763fb85756f69899f7b3b71c01bb01461ee3c (patch)
tree725e9915e5d94cc65c158929b20f096d0f7b97b0 /module/web/api_app.py
parentfixed import (diff)
downloadpyload-a8f763fb85756f69899f7b3b71c01bb01461ee3c.tar.xz
beginning new pyload web-ui from scratch
Diffstat (limited to 'module/web/api_app.py')
-rw-r--r--module/web/api_app.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/module/web/api_app.py b/module/web/api_app.py
index 7a9eb8558..df62db18f 100644
--- a/module/web/api_app.py
+++ b/module/web/api_app.py
@@ -7,11 +7,11 @@ from traceback import format_exc, print_exc
from bottle import route, request, response, HTTPError
-from utils import toDict, set_session
+from utils import set_session
from webinterface import PYLOAD
from module.common.json_layer import json
-from module.utils import remove_chars
+from module.utils import remove_chars, to_dict
from module.lib.SafeEval import const_eval as literal_eval
from module.Api import BaseObject
@@ -20,7 +20,7 @@ class TBaseEncoder(json.JSONEncoder):
def default(self, o):
if isinstance(o, BaseObject):
- return toDict(o)
+ return to_dict(o)
return json.JSONEncoder.default(self, o)