From e48abf98766b0a9c5799f17073d867dc09b23663 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Fri, 17 Apr 2015 17:54:19 +0200 Subject: PEP-8, Python Zen, refactor and reduce code (part 3 in master module) Conflicts: module/InitHomeDir.py module/debug.py module/forwarder.py module/unescape.py pyload/datatype/Package.py pyload/manager/Event.py pyload/manager/Thread.py pyload/manager/event/Scheduler.py pyload/utils/__init__.py pyload/webui/filters.py --- pyload/webui/app/api.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'pyload/webui/app/api.py') diff --git a/pyload/webui/app/api.py b/pyload/webui/app/api.py index 267b9b37c..16e8c2447 100644 --- a/pyload/webui/app/api.py +++ b/pyload/webui/app/api.py @@ -14,9 +14,9 @@ from SafeEval import const_eval as literal_eval from pyload.api import BaseObject + # json encoder that accepts TBase objects class TBaseEncoder(json.JSONEncoder): - def default(self, o): if isinstance(o, BaseObject): return toDict(o) @@ -45,7 +45,8 @@ def call_api(func, args=""): kwargs = {} for x, y in chain(request.GET.iteritems(), request.POST.iteritems()): - if x == "session": continue + if x == "session": + continue kwargs[x] = unquote(y) try: @@ -64,9 +65,7 @@ def callApi(func, *args, **kwargs): **dict((x, literal_eval(y)) for x, y in kwargs.iteritems())) # null is invalid json response - if result is None: result = True - - return json.dumps(result, cls=TBaseEncoder) + return json.dumps(result or True, cls=TBaseEncoder) # post -> username, password -- cgit v1.2.3