diff options
author | Walter Purcaro <vuolter@users.noreply.github.com> | 2015-04-17 17:54:19 +0200 |
---|---|---|
committer | Walter Purcaro <vuolter@users.noreply.github.com> | 2015-04-17 17:54:19 +0200 |
commit | e48abf98766b0a9c5799f17073d867dc09b23663 (patch) | |
tree | 08e907597b172e5879c59eea4421b58a4b73fd46 /pyload/webui/app/api.py | |
parent | Spare code cosmetics (4) (diff) | |
download | pyload-e48abf98766b0a9c5799f17073d867dc09b23663.tar.xz |
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
Diffstat (limited to 'pyload/webui/app/api.py')
-rw-r--r-- | pyload/webui/app/api.py | 9 |
1 files changed, 4 insertions, 5 deletions
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 |