replace concatenations with f-string in plugins (#10285)

* replace concatenations with f-string in plugins

* add changelog frag

Author: russoz

changelogs/fragments/10285-fstr-plugins.yml

@@ -0,0 +1,7 @@
+minor_changes:
+  - dense callback plugin - use f-strings instead of concatenation (https://github.com/ansible-collections/community.general/pull/10285).
+  - mail callback plugin - use f-strings instead of concatenation (https://github.com/ansible-collections/community.general/pull/10285).
+  - wsl connection plugin - use f-strings instead of concatenation (https://github.com/ansible-collections/community.general/pull/10285).
+  - jc filter plugin - use f-strings instead of concatenation (https://github.com/ansible-collections/community.general/pull/10285).
+  - iocage inventory plugin - use f-strings instead of concatenation (https://github.com/ansible-collections/community.general/pull/10285).
+  - xen_orchestra inventory plugin - use f-strings instead of concatenation (https://github.com/ansible-collections/community.general/pull/10285).

plugins/callback/dense.py

@@ -263,12 +263,8 @@ def _display_progress(self, result=None):
             sys.stdout.write(colors[self.hosts[name]['state']] + name + vt100.reset)
             sys.stdout.flush()
 
-#        if result._result.get('diff', False):
-#            sys.stdout.write('\n' + vt100.linewrap)
         sys.stdout.write(vt100.linewrap)
 
-#        self.keep = True
-
     def _display_task_banner(self):
         if not self.shown_title:
             self.shown_title = True
@@ -312,12 +308,12 @@ def _display_results(self, result, status):
 
             delegated_vars = result._result.get('_ansible_delegated_vars', None)
             if delegated_vars:
-                sys.stdout.write(f"{vt100.reset + result._host.get_name()}>{colors[status]}{delegated_vars['ansible_host']}")
+                sys.stdout.write(f"{vt100.reset}{result._host.get_name()}>{colors[status]}{delegated_vars['ansible_host']}")
             else:
                 sys.stdout.write(result._host.get_name())
 
             sys.stdout.write(f": {dump}\n")
-            sys.stdout.write(vt100.reset + vt100.save + vt100.clearline)
+            sys.stdout.write(f"{vt100.reset}{vt100.save}{vt100.clearline}")
             sys.stdout.flush()
 
         if status == 'changed':

plugins/callback/mail.py

@@ -212,7 +212,8 @@ def mail_result(self, result, failtype):
         if self.itembody:
             body += self.itembody
         elif result._result.get('failed_when_result') is True:
-            fail_cond = self.indent('failed_when:\n- ' + '\n- '.join(result._task.failed_when))
+            fail_cond_list = '\n- '.join(result._task.failed_when)
+            fail_cond = self.indent(f"failed_when:\n- {fail_cond_list}")
             body += f"due to the following condition:\n\n{fail_cond}\n\n"
         elif result._result.get('msg'):
             body += self.body_blob(result._result['msg'], 'message')

plugins/connection/wsl.py

@@ -522,8 +522,10 @@ def _connect(self) -> Connection:
             if u'PID check failed' in msg:
                 raise AnsibleError('paramiko version issue, please upgrade paramiko on the machine running ansible')
             elif u'Private key file is encrypted' in msg:
-                msg = f'ssh {self.get_option("remote_user")}@{self.get_options("remote_addr")}:{port} : ' + \
+                msg = (
+                    f'ssh {self.get_option("remote_user")}@{self.get_options("remote_addr")}:{port} : '
                     f'{msg}\nTo connect as a different user, use -u <username>.'
+                )
                 raise AnsibleConnectionFailure(msg)
             else:
                 raise AnsibleConnectionFailure(msg)
@@ -656,7 +658,7 @@ def exec_command(self, cmd: str, in_data: bytes | None = None, sudoable: bool =
                 chan.shutdown_write()
 
         except socket.timeout:
-            raise AnsibleError('ssh timed out waiting for privilege escalation.\n' + to_text(become_output))
+            raise AnsibleError(f'ssh timed out waiting for privilege escalation.\n{to_text(become_output)}')
 
         stdout = b''.join(chan.makefile('rb', bufsize))
         stderr = b''.join(chan.makefile_stderr('rb', bufsize))

plugins/filter/jc.py

@@ -143,11 +143,11 @@ def jc_filter(data, parser, quiet=True, raw=False):
 
         # old API (jc v1.17.7 and lower)
         else:
-            jc_parser = importlib.import_module('jc.parsers.' + parser)
+            jc_parser = importlib.import_module(f'jc.parsers.{parser}')
             return jc_parser.parse(data, quiet=quiet, raw=raw)
 
     except Exception as e:
-        raise AnsibleFilterError('Error in jc filter plugin:  %s' % e)
+        raise AnsibleFilterError(f'Error in jc filter plugin: {e}')
 
 
 class FilterModule(object):

plugins/inventory/iocage.py

@@ -350,7 +350,7 @@ def get_inventory(self, path):
             for hostname, host_vars in results['_meta']['hostvars'].items():
                 iocage_hooks = []
                 for hook in hooks_results:
-                    path = "/" + iocage_pool + "/iocage/jails/" + hostname + "/root" + hook
+                    path = f"/{iocage_pool}/iocage/jails/{hostname}/root{hook}"
                     cmd_cat_hook = cmd.copy()
                     cmd_cat_hook.append('cat')
                     cmd_cat_hook.append(path)

plugins/inventory/xen_orchestra.py

@@ -224,7 +224,7 @@ def _add_vms(self, vms, hosts, pools):
                     vm_name_list.append(vm['name_label'])
                 else:
                     vm_duplicate_count = vm_name_list.count(vm['name_label'])
-                    entry_name = vm['name_label'] + "_" + str(vm_duplicate_count)
+                    entry_name = f"{vm['name_label']}_{vm_duplicate_count}"
                     vm_name_list.append(vm['name_label'])
             else:
                 entry_name = uuid
@@ -284,7 +284,7 @@ def _add_hosts(self, hosts, pools):
                     host_name_list.append(host['name_label'])
                 else:
                     host_duplicate_count = host_name_list.count(host['name_label'])
-                    entry_name = host['name_label'] + "_" + str(host_duplicate_count)
+                    entry_name = f"{host['name_label']}_{host_duplicate_count}"
                     host_name_list.append(host['name_label'])
             else:
                 entry_name = host['uuid']