PR#326: [backend] resolving pyling warnings - line too long and no else return - copr/copr

copr / copr

#326 [backend] resolving pyling warnings - line too long and no else return

Merged 5 years ago by frostyx. Opened 5 years ago by pjunak.

copr/ pjunak/copr pylint2 into master

[backend] resolving pylint warnings - no else return and simplifiable if

Petr Junák • 5 years ago

2cabcea

[backend] resolving pylint warning - line too long

Petr Junák • 5 years ago

83442d6

backend/backend/createrepo.py

file modified

+1 -2

		`@@ -174,5 +174,4 @@`
		`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")`

backend/backend/daemons/log.py

file modified

+1 -4

		`@@ -30,10 +30,7 @@`
		`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`
pjunak commented 5 years ago Replaced if statement with return bool.


		`class CustomFilter(logging.Filter):`

backend/backend/helpers.py

file modified

+3 -6

		`@@ -302,8 +302,7 @@`

		`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 @@`

		`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 @@`

		`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):`

backend/backend/mockremote/builder.py

file modified

+2 -1

		`@@ -194,7 +194,8 @@`
		`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)`

backend/backend/vm_manage/manager.py

file modified

+1 -2

		`@@ -200,8 +200,7 @@`
		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)`

pjunak commented 5 years ago

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.daemons.log
R: 33, 8: Unnecessary "else" after "return" (no-else-return)
* Module backend.vm_manage.manager
R:199, 8: Unnecessary "else" after "return" (no-else-return)
**** Module backend.mockremote.builder
C:197, 0: Line too long (149/120) (line-too-long)

In issue #325 no one was against resolving no-else-return warnings.

2 new commits added

[backend] resolving pylint warning - line too long
[backend] resolving pylint warnings - no else return

5 years ago

2 new commits added

[backend] resolving pylint warning - line too long
[backend] resolving pylint warnings - no else return

5 years ago

frostyx commented 5 years ago

Returns without else look good.

err_msg = "Failed to download data from builder due to rsync error,"\
"see the rsync log file for details. Original error: {}".format(error)

Personally, I prefer

err_msg = ("Failed to download data from builder due to rsync error,"
           "see the rsync log file for details. Original error: {}".format(error))

but it is not a big deal