Merge ~xavpaice/charm-nagios:lintfix into charm-nagios:master

[Xav Paice]

Minor lint fixes

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

A CI job is currently in progress. A follow up comment will be added when it completes.

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

PASSED: Continuous integration, rev:b286e8dc2f313258a7b4771a710606526426de6e
https://jenkins.canonical.com/bootstack/job/lp-charm-nagios-ci/1/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/9/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/364/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-nagios-ci/1//rebuild

review: Approve (continuous-integration)

[Celia Wang (ziyiwang)]

lgtm

review: Approve

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision 356cb9a457e5721975f26c9382c9e8d8162d4562

diff --git a/hooks/upgrade_charm.py b/hooks/upgrade_charm.py
index 6338561..81b8875 100755
--- a/hooks/upgrade_charm.py
+++ b/hooks/upgrade_charm.py
@@ -626,7 +626,7 @@ def update_password(account, password):
             ["htpasswd", "-b", "/etc/nagios3/htpasswd.users", account, password]
         )
     else:
-        """ password was empty, it has been removed. We should delete the account """
+        """password was empty, it has been removed. We should delete the account"""
         os.path.isfile(account_file) and os.remove(account_file)
         subprocess.call(["htpasswd", "-D", "/etc/nagios3/htpasswd.users", account])
 
diff --git a/tests/functional/test_config.py b/tests/functional/test_config.py
index a607878..2625ff2 100644
--- a/tests/functional/test_config.py
+++ b/tests/functional/test_config.py
@@ -147,7 +147,8 @@ async def test_live_status(unit, livestatus_path, file_stat):
 async def test_livestatus_xinetd(unit, livestatus_path, livestatus_socket, run_command):
     assert livestatus_socket is True, "Livestatus xinetd is not enabled"
     out = await run_command(
-        "echo -e 'GET hosts\nColumns: name\n' | nc 127.0.0.1 6557", unit.u)
+        "echo -e 'GET hosts\nColumns: name\n' | nc 127.0.0.1 6557", unit.u
+    )
     assert "nagios" in out["Stdout"], "Livestatus output is not expected"