From d28c72b6f13c669ebe8c179335d52c2fc609fdbb Mon Sep 17 00:00:00 2001 From: Miroslav Stampar Date: Thu, 24 Sep 2015 16:26:52 +0200 Subject: [PATCH] Another fix for Python 2.6 (bug introduced with ff7be9d0eb5baf89a5acc8a4c5325767e3582129) --- lib/utils/api.py | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/lib/utils/api.py b/lib/utils/api.py index d8a38bf1e..07367b15c 100644 --- a/lib/utils/api.py +++ b/lib/utils/api.py @@ -376,15 +376,12 @@ def task_list(taskid=None): """ List task pull """ - if is_admin(taskid): - tasks = list(DataStore.tasks) - else: - tasks = [] - for key in DataStore.tasks: - if DataStore.tasks[key].remote_addr == request.remote_addr: - tasks.append(key) - tasks = {x: dejsonize(scan_status(x))['status'] - for x in list(DataStore.tasks)} + tasks = {} + + for key in DataStore.tasks: + if is_admin(taskid) or DataStore.tasks[key].remote_addr == request.remote_addr: + tasks[key] = dejsonize(scan_status(key))["status"] + logger.debug("[%s] Listed task pool (%s)" % (taskid, "admin" if is_admin(taskid) else request.remote_addr)) return jsonize({"success": True, "tasks": tasks, "tasks_num": len(tasks)})