[PEP8] cleanup, part 1

Author: Valentin Gologuzov

backend/backend/dispatcher.py

@@ -29,12 +29,13 @@
 except ImportError:
     pass  # fedmsg is optional
 
+
 def ans_extra_vars_encode(extra_vars, name):
     """ transform dict into --extra-vars="json string" """
     if not extra_vars:
         return ""
-    return "--extra-vars='{{\"{0}\": {1}}}'".format(
-            name, json.dumps(extra_vars))
+    return "--extra-vars='{{\"{0}\": {1}}}'".format(name, json.dumps(extra_vars))
+
 
 class SilentPlaybookCallbacks(callbacks.PlaybookCallbacks):
 
@@ -147,11 +148,11 @@ def __init__(self, opts, events, worker_num, group_id,
         self.spawn_in_advance = self.opts.spawn_in_advance
         self.frontend_callback = FrontendCallback(opts, events)
         if not self.callback:
-            self.logfile = os.path.join(
-                self.opts.worker_logdir,
-                "worker-{0}-{1}.log".format(
-                            self.opts.build_groups[self.group_id]["name"],
-                            self.worker_num))
+            log_name = "worker-{0}-{1}.log".format(
+                self.opts.build_groups[self.group_id]["name"],
+                self.worker_num)
+
+            self.logfile = os.path.join(self.opts.worker_logdir, log_name)
             self.callback = WorkerCallback(logfile=self.logfile)
 
         if ip:
@@ -289,8 +290,7 @@ def spawn_instance(self, job):
             return None
 
         args = "-c ssh {0} {1}".format(
-                spawn_playbook,
-                ans_extra_vars_encode(extra_vars, "copr_task"))
+            spawn_playbook, ans_extra_vars_encode(extra_vars, "copr_task"))
 
         i = 0
         while True:
@@ -327,12 +327,13 @@ def spawn_instance(self, job):
             # we were getting some dead instancies
             # that's why I'm testing the conncectivity here
             connection = ansible.runner.Runner(
-                            remote_user="root",
-                            host_list=ipaddr+",",
-                            pattern=ipaddr,
-                            forks=1,
-                            transport="ssh",
-                            timeout=500)
+                remote_user="root",
+                host_list=ipaddr+",",
+                pattern=ipaddr,
+                forks=1,
+                transport="ssh",
+                timeout=500
+            )
             connection.module_name = "shell"
             connection.module_args = "echo hello"
             res = connection.run()
@@ -341,8 +342,9 @@ def spawn_instance(self, job):
                 return ipaddr
 
             else:
-                self.callback.log("Worker is not responding to" \
-                        "the testing playbook. Spawning another one.")
+                self.callback.log(
+                    "Worker is not responding to"
+                    "the testing playbook. Spawning another one.")
                 self.terminate_instance(ipaddr)
 
     def terminate_instance(self, instance_ip):
@@ -357,8 +359,8 @@ def terminate_instance(self, instance_ip):
                     term_args["vm_name"] = self.vm_name
 
         args = "-c ssh -i '{0},' {1} {2}".format(
-                instance_ip, self.opts.build_groups[self.group_id]["terminate_playbook"],
-                ans_extra_vars_encode(term_args, "copr_task"))
+            instance_ip, self.opts.build_groups[self.group_id]["terminate_playbook"],
+            ans_extra_vars_encode(term_args, "copr_task"))
         self.run_ansible_playbook(args, "terminate instance")
 
     def mark_started(self, job):
@@ -368,11 +370,9 @@ def mark_started(self, job):
 
         job.status = 3  # running
         build = job.to_dict()
-
         self.callback.log("build: {}".format(build))
-        #build["status"] = 3  # running
-        data = {"builds": [build]}
 
+        data = {"builds": [build]}
         try:
             self.frontend_callback.update(data)
         except:
@@ -453,8 +453,8 @@ def run(self):
 
         while not self.kill_received:
             setproctitle("worker-{0} {1}  No task".format(
-                        self.opts.build_groups[self.group_id]["name"],
-                        self.worker_num))
+                self.opts.build_groups[self.group_id]["name"],
+                self.worker_num))
 
             # this sometimes caused TypeError in random worker
             # when another one  picekd up a task to build
@@ -496,10 +496,11 @@ def run(self):
             # Checking whether to build or skip
             if self.pkg_built_before(job.pkgs, job.chroot, job.destdir):
                 self._announce_start(job)
-                self.callback.log("Skipping: package {0} has been"\
-                            "already built before.".format(
-                            ' '.join(job.pkgs)))
-                job.status = 5 # skipped
+                self.callback.log(
+                    "Skipping: package {0} has been already built before."
+                    .format(' '.join(job.pkgs)))
+
+                job.status = 5  # skipped
                 self._announce_end(job)
                 continue
             # FIXME

frontend/coprs_frontend/coprs/logic/builds_logic.py

@@ -43,22 +43,21 @@ def get_recent_tasks(cls, user=None, limit=None):
 
         return query
 
-
     @classmethod
     def get_build_task_queue(cls):
         """
         Returns BuildChroots which are - waiting to be built or
                                        - older than 2 hours and unfinished
         """
         query = models.BuildChroot.query.join(models.Build).filter(or_(
-                    models.BuildChroot.status == helpers.StatusEnum("pending"),
-                    models.BuildChroot.status == helpers.StatusEnum("starting"),
-                    and_(
-                        models.BuildChroot.status == helpers.StatusEnum("running"),
-                        models.Build.started_on < int(time.time() - 7200),
-                        models.Build.ended_on == None
-                        )
-                    ))
+            models.BuildChroot.status == helpers.StatusEnum("pending"),
+            models.BuildChroot.status == helpers.StatusEnum("starting"),
+            and_(
+                models.BuildChroot.status == helpers.StatusEnum("running"),
+                models.Build.started_on < int(time.time() - 7200),
+                models.Build.ended_on is None
+            )
+        ))
         query = query.order_by(models.BuildChroot.build_id.asc())
         return query
 
@@ -102,7 +101,7 @@ def get_waiting(cls):
                  .filter((models.Build.started_on == None)
                          | (models.Build.started_on < int(time.time() - 7200)))
                  .filter(models.Build.ended_on == None)
-                 .filter(models.Build.canceled != True)
+                 .filter(models.Build.canceled == False)
                  .order_by(models.Build.submitted_on.asc()))
         return query
 
@@ -196,7 +195,7 @@ def cancel_build(cls, user, build):
                 "You are not allowed to cancel this build.")
         build.canceled = True
         for chroot in build.build_chroots:
-            chroot.status = 2 #canceled
+            chroot.status = 2  # canceled
 
     @classmethod
     def delete_build(cls, user, build):
@@ -210,19 +209,21 @@ def delete_build(cls, user, build):
                 "Unfinished build")
 
         # Only failed (and finished), succeeded, skipped and cancelled get here.
-        if build.state != "cancelled": #has nothing in backend to delete
+        if build.state != "cancelled":  # has nothing in backend to delete
             object_type = "build-{0}".format(build.state)
             data_dict = {"pkgs": build.pkgs,
                          "username": build.copr.owner.name,
                          "projectname": build.copr.name}
 
-            action = models.Action(action_type=helpers.ActionTypeEnum("delete"),
-                               object_type=object_type,
-                               object_id=build.id,
-                               old_value="{0}/{1}".format(build.copr.owner.name,
-                                                          build.copr.name),
-                               data=json.dumps(data_dict),
-                               created_on=int(time.time()))
+            action = models.Action(
+                action_type=helpers.ActionTypeEnum("delete"),
+                object_type=object_type,
+                object_id=build.id,
+                old_value="{0}/{1}".format(build.copr.owner.name,
+                                           build.copr.name),
+                data=json.dumps(data_dict),
+                created_on=int(time.time())
+            )
             db.session.add(action)
 
         for build_chroot in build.build_chroots:
@@ -237,13 +238,13 @@ def last_modified(cls, copr):
         """
         builds = cls.get_multiple(None, copr=copr)
 
-        last_build = (builds
-                    .join(models.BuildChroot)
-                    .filter((models.BuildChroot.status == helpers.StatusEnum("succeeded"))
-                            | (models.BuildChroot.status == helpers.StatusEnum("skipped")))
-                    .filter(models.Build.ended_on != None)
-                    .order_by(models.Build.ended_on.desc())
-                    ).first()
+        last_build = (
+            builds.join(models.BuildChroot)
+            .filter((models.BuildChroot.status == helpers.StatusEnum("succeeded"))
+                    | (models.BuildChroot.status == helpers.StatusEnum("skipped")))
+            .filter(models.Build.ended_on != None)
+            .order_by(models.Build.ended_on.desc())
+        ).first()
         if last_build:
             return last_build.ended_on
         else:

frontend/coprs_frontend/coprs/logic/coprs_logic.py

@@ -8,6 +8,7 @@
 from coprs import signals
 from coprs.logic import users_logic
 
+
 class CoprsLogic(object):
 
     """

frontend/coprs_frontend/coprs/views/admin_ns/admin_general.py

@@ -15,6 +15,7 @@
 
 from coprs.exceptions import InsufficientRightsException
 
+
 @admin_ns.route("/")
 @login_required(role=helpers.RoleEnum("admin"))
 def admin_index():
@@ -24,12 +25,13 @@ def admin_index():
 @admin_ns.route("/legal-flag/")
 @login_required(role=helpers.RoleEnum("admin"))
 def legal_flag():
-    legal_flags = (models.LegalFlag.query
-                   .outerjoin(models.LegalFlag.copr)
-                   .options(db.contains_eager(models.LegalFlag.copr))
-                   .filter(models.LegalFlag.resolved_on == None)
-                   .order_by(models.LegalFlag.raised_on.desc())
-                   .all())
+    legal_flags = (
+        models.LegalFlag.query
+        .outerjoin(models.LegalFlag.copr)
+        .options(db.contains_eager(models.LegalFlag.copr))
+        .filter(models.LegalFlag.resolved_on == None)
+        .order_by(models.LegalFlag.raised_on.desc())
+        .all())
 
     return flask.render_template("admin/legal-flag.html",
                                  legal_flags=legal_flags)
@@ -65,13 +67,14 @@ def playground():
             copr = coprs_logic.CoprsLogic.get(flask.g.user, username, coprname).first()
 
             if copr:
-                return flask.redirect(flask.url_for("admin_ns.playground_project",
-                                            username=username,
-                                            coprname=coprname))
+                return flask.redirect(flask.url_for(
+                    "admin_ns.playground_project",
+                    username=username,
+                    coprname=coprname))
             else:
                 flask.flash("This project does not exist")
 
-    return flask.render_template("admin/playground.html", form_search = form)
+    return flask.render_template("admin/playground.html", form_search=form)
 
 
 @admin_ns.route("/playground/<username>/<coprname>/")
@@ -84,9 +87,7 @@ def playground_project(username, coprname):
 
     form = forms.AdminPlaygroundForm()
     form.playground.data = copr.playground
-    return flask.render_template("admin/playground.html",
-                                        form_set = form,
-                                        copr = copr)
+    return flask.render_template("admin/playground.html", form_set=form, copr=copr)
 
 
 @admin_ns.route("/playground/<username>/<coprname>/set/", methods=["POST"])
@@ -107,7 +108,6 @@ def playground_set(username, coprname):
                 flask.flash("Playground flag has been updated")
                 db.session.commit()
 
-    return flask.redirect(flask.url_for("admin_ns.playground_project", 
+    return flask.redirect(flask.url_for("admin_ns.playground_project",
                                         username=username,
                                         coprname=coprname))
-