Remove extra list call when iterating

Author: tume

mrq/basetasks/utils.py

@@ -1,4 +1,5 @@
 from __future__ import print_function
+from future.utils import itervalues
 from mrq.task import Task
 from mrq.queue import Queue
 from bson import ObjectId
@@ -51,7 +52,7 @@ def build_query(self):
         if self.params.get("params"):
             params_dict = json.loads(self.params.get("params"))  # pylint: disable=no-member
 
-            for key in list(params_dict.keys()):
+            for key in params_dict:
                 query["params.%s" % key] = params_dict[key]
 
         return query
@@ -77,7 +78,7 @@ def perform_action(self, action, query, destination_queue):
             else:
 
                 tasks_defs = get_current_config().get("tasks", {})
-                tasks_ttls = [cfg.get("result_ttl", 0) for cfg in list(tasks_defs.values())]
+                tasks_ttls = [cfg.get("result_ttl", 0) for cfg in itervalues(tasks_defs)]
 
                 result_ttl = max([default_job_timeout] + tasks_ttls)
 

mrq/dashboard/app.py

@@ -1,6 +1,7 @@
 from __future__ import print_function
 from future import standard_library
 standard_library.install_aliases()
+from future.utils import iteritems
 from gevent import monkey
 monkey.patch_all()
 
@@ -44,7 +45,7 @@
 @requires_auth
 def root():
     return render_template("index.html", MRQ_CONFIG={
-        k: v for k, v in list(cfg.items()) if k in WHITELISTED_MRQ_CONFIG_KEYS
+        k: v for k, v in iteritems(cfg) if k in WHITELISTED_MRQ_CONFIG_KEYS
     })
 
 
@@ -152,7 +153,7 @@ def build_api_datatables_query(req):
             try:
                 params_dict = json.loads(req.args.get("params"))
 
-                for key in list(params_dict.keys()):
+                for key in params_dict:
                     query["params.%s" % key] = params_dict[key]
             except Exception as e:  # pylint: disable=broad-except
                 print("Error will converting form JSON: %s" % e)
@@ -304,7 +305,7 @@ def api_job_traceback(job_id):
 @app.route('/api/jobaction', methods=["POST"])
 @requires_auth
 def api_job_action():
-    params = {k: v for k, v in request.form.items()}
+    params = {k: v for k, v in iteritems(request.form)}
     if params.get("status") and "-" in params.get("status"):
         params["status"] = params.get("status").split("-")
     return jsonify({"job_id": queue_job("mrq.basetasks.utils.JobAction",

mrq/logger.py

@@ -1,5 +1,6 @@
 from __future__ import print_function
 from builtins import object
+from future.utils import iteritems
 
 from collections import defaultdict
 import datetime
@@ -99,10 +100,10 @@ def flush(self, w=0):
         inserts = [{
             "worker": k,
             "logs": "\n".join(v) + "\n"
-        } for k, v in self.buffer["workers"].items()] + [{
+        } for k, v in iteritems(self.buffer["workers"])] + [{
             "job": k,
             "logs": "\n".join(v) + "\n"
-        } for k, v in self.buffer["jobs"].items()]
+        } for k, v in iteritems(self.buffer["jobs"])]
 
         if len(inserts) == 0:
             return

mrq/queue.py

@@ -240,7 +240,7 @@ def all_active(cls):
 
         prefix = context.get_current_config()["redis_prefix"]
         queues = []
-        for key in list(context.connections.redis.keys()):
+        for key in context.connections.redis:
             if key.startswith(prefix):
                 queues.append(Queue(key[len(prefix) + 3:]))
 

mrq/scheduler.py

@@ -1,5 +1,6 @@
 from builtins import str
 from builtins import object
+from future.utils import iteritems
 from .context import log, queue_job
 import datetime
 import ujson as json
@@ -41,7 +42,7 @@ def sync_tasks(self, tasks):
                 self.collection.remove({"_id": task["_id"]})
                 log.debug("Scheduler: deleted %s" % task["hash"])
 
-        for h, task in tasks_by_hash.items():
+        for h, task in iteritems(tasks_by_hash):
             task["hash"] = h
             task["datelastqueued"] = datetime.datetime.fromtimestamp(0)
             if task.get("dailytime"):

mrq/worker.py

@@ -2,7 +2,7 @@
 standard_library.install_aliases()
 from builtins import str
 from builtins import bytes
-from time import sleep
+from future.utils import iteritems
 import gevent
 import gevent.pool
 import os
@@ -304,7 +304,7 @@ def get_worker_report(self, with_memory=False):
         io = None
         if self._traced_io:
             io = {}
-            for k, v in list(self._traced_io.items()):
+            for k, v in iteritems(self._traced_io):
                 if k == "total":
                     io[k] = v
                 else:
@@ -314,7 +314,7 @@ def get_worker_report(self, with_memory=False):
 
         return {
             "status": self.status,
-            "config": {k: v for k, v in self.config.items() if k in whitelisted_config},
+            "config": {k: v for k, v in iteritems(self.config) if k in whitelisted_config},
             "done_jobs": self.done_jobs,
             "pool_usage_average": self.pool_usage_average.next(used_pool_slots),
             "datestarted": self.datestarted,