From 83442d6b07fc335d198e72c1042a8232a4c18070 Mon Sep 17 00:00:00 2001 From: Petr Junák Date: Jun 25 2018 09:03:04 +0000 Subject: [PATCH 1/2] [backend] resolving pylint warning - line too long addressing: ************* Module backend.mockremote.builder C:197, 0: Line too long (149/120) (line-too-long) --- diff --git a/backend/backend/mockremote/builder.py b/backend/backend/mockremote/builder.py index cee395f..85d416c 100644 --- a/backend/backend/mockremote/builder.py +++ b/backend/backend/mockremote/builder.py @@ -194,7 +194,8 @@ class Builder(object): cmd.wait() self.log.info("rsyncing finished.") except Exception as error: - err_msg = "Failed to download data from builder due to rsync error, see the rsync log file for details. Original error: {}".format(error) + err_msg = ("Failed to download data from builder due to rsync error, " + "see the rsync log file for details. Original error: {}".format(error)) self.log.error(err_msg) raise BuilderError(err_msg) From 2cabceab2a3c168a035998586fb7dbea7eb2ab79 Mon Sep 17 00:00:00 2001 From: Petr Junák Date: Jun 25 2018 11:15:01 +0000 Subject: [PATCH 2/2] [backend] resolving pylint warnings - no else return and simplifiable if addressing: ************* Module backend.createrepo R:172, 4: Unnecessary "else" after "return" (no-else-return) ************* Module backend.helpers R:303, 4: Unnecessary "else" after "return" (no-else-return) R:313, 4: Unnecessary "else" after "return" (no-else-return) R:323, 4: Unnecessary "else" after "return" (no-else-return) ************* Module backend.vm_manage.manager R:199, 8: Unnecessary "else" after "return" (no-else-return) ************* Module backend.daemons.log R: 33, 8: The if statement can be replaced with 'return bool(test)' (simplifiable-if-statement) --- diff --git a/backend/backend/createrepo.py b/backend/backend/createrepo.py index a1849db..99db5f3 100644 --- a/backend/backend/createrepo.py +++ b/backend/backend/createrepo.py @@ -174,5 +174,4 @@ def createrepo(path, front_url, username, projectname, out_ad = add_appdata(path, username, projectname) out_md = add_modules(path) return "\n".join([out_cr, out_ad, out_md]) - else: - return createrepo_unsafe(path, base_url=base_url, dest_dir="devel") + return createrepo_unsafe(path, base_url=base_url, dest_dir="devel") diff --git a/backend/backend/daemons/log.py b/backend/backend/daemons/log.py index f53eeb1..4fd7cae 100644 --- a/backend/backend/daemons/log.py +++ b/backend/backend/daemons/log.py @@ -30,10 +30,7 @@ class LogRouterFilter(logging.Filter): self.who = who def filter(self, record): - if record.event.get("who") == self.who: - return True - else: - return False + return record.event.get("who") == self.who class CustomFilter(logging.Filter): diff --git a/backend/backend/helpers.py b/backend/backend/helpers.py index 80e0663..7b5cfb7 100644 --- a/backend/backend/helpers.py +++ b/backend/backend/helpers.py @@ -302,8 +302,7 @@ def get_auto_createrepo_status(front_url, username, projectname): if "auto_createrepo" in result.data["detail"]: return bool(result.data["detail"]["auto_createrepo"]) - else: - return True + return True def get_persistent_status(front_url, username, projectname): @@ -312,8 +311,7 @@ def get_persistent_status(front_url, username, projectname): if "persistent" in result.data["detail"]: return bool(result.data["detail"]["persistent"]) - else: - return True + return True def get_auto_prune_status(front_url, username, projectname): @@ -322,8 +320,7 @@ def get_auto_prune_status(front_url, username, projectname): if "auto_prune" in result.data["detail"]: return bool(result.data["detail"]["auto_prune"]) - else: - return True + return True # def log(lf, msg, quiet=None): diff --git a/backend/backend/vm_manage/manager.py b/backend/backend/vm_manage/manager.py index 13ab8cc..24a91e7 100644 --- a/backend/backend/vm_manage/manager.py +++ b/backend/backend/vm_manage/manager.py @@ -200,8 +200,7 @@ class VmManager(object): self.log.debug("No VM are available, user `{}` already acquired #{} VMs" .format(username, vm_count_used_by_user)) return False - else: - return True + return True def get_ready_vms(self, group): vmd_list = self.get_all_vm_in_group(group)