summaryrefslogtreecommitdiffstats
path: root/pyload/webui/app/api.py
diff options
context:
space:
mode:
authorGravatar Walter Purcaro <vuolter@users.noreply.github.com> 2015-05-01 18:11:25 +0200
committerGravatar Walter Purcaro <vuolter@users.noreply.github.com> 2015-05-01 18:11:25 +0200
commitc126f738bd5be581d5321521eedc9b14a8165a0e (patch)
tree418989bfa81bfd30085f09102df53f6f58b00f14 /pyload/webui/app/api.py
parentUse 'import' instead 'from' (1) (diff)
downloadpyload-c126f738bd5be581d5321521eedc9b14a8165a0e.tar.xz
Use 'import' instead 'from' (2)
Diffstat (limited to 'pyload/webui/app/api.py')
-rw-r--r--pyload/webui/app/api.py18
1 files changed, 9 insertions, 9 deletions
diff --git a/pyload/webui/app/api.py b/pyload/webui/app/api.py
index 70d86c112..7f1b230da 100644
--- a/pyload/webui/app/api.py
+++ b/pyload/webui/app/api.py
@@ -1,17 +1,17 @@
# -*- coding: utf-8 -*-
-from urllib import unquote
+import traceback
+
from itertools import chain
-from traceback import format_exc, print_exc
+from urllib import unquote
+from SafeEval import const_eval as literal_eval
from bottle import route, request, response, HTTPError
-from pyload.webui.app.utils import toDict, set_session
-from pyload.webui import PYLOAD
-from pyload.utils import json
-from SafeEval import const_eval as literal_eval
from pyload.api import BaseObject
-
+from pyload.utils import json
+from pyload.webui import PYLOAD
+from pyload.webui.app.utils import toDict, set_session
# json encoder that accepts TBase objects
@@ -51,8 +51,8 @@ def call_api(func, args=""):
try:
return callApi(func, *args, **kwargs)
except Exception, e:
- print_exc()
- return HTTPError(500, json.dumps({"error": e.message, "traceback": format_exc()}))
+ traceback.print_exc()
+ return HTTPError(500, json.dumps({"error": e.message, "traceback": traceback.format_exc()}))
def callApi(func, *args, **kwargs):