switch to f-strings

hooks/yum/patchman.py

@@ -28,5 +28,5 @@ def posttrans_hook(conduit):
                                     'servicecmd',
                                     '/usr/sbin/patchman-client')
     args = '-n'
-    command = '{0!s} {1!s}> /dev/null'.format(servicecmd, args)
+    command = f'{servicecmd!s} {args!s}> /dev/null'
     os.system(command)

hooks/zypper/patchman.py

@@ -26,23 +26,23 @@
 class MyPlugin(Plugin):
 
     def PLUGINBEGIN(self, headers, body):
-        logging.info("PLUGINBEGIN")
-        logging.debug("headers: {0!s}".format(headers))
+        logging.info('PLUGINBEGIN')
+        logging.debug(f'headers: {headers!s}')
         self.ack()
 
     def PACKAGESETCHANGED(self, headers, body):
-        logging.info("PACKAGESETCHANGED")
-        logging.debug("headers: {0!s}".format(headers))
+        logging.info('PACKAGESETCHANGED')
+        logging.debug(f'headers: {headers!s}')
         print('patchman: sending data')
         servicecmd = '/usr/sbin/patchman-client'
         args = '-n'
-        command = '{0!s} {1!s}> /dev/null'.format(servicecmd, args)
+        command = f'{servicecmd!s} {args!s}> /dev/null'
         os.system(command)
         self.ack()
 
     def PLUGINEND(self, headers, body):
-        logging.info("PLUGINEND")
-        logging.debug("headers: {0!s}".format(headers))
+        logging.info('PLUGINEND')
+        logging.debug(f'headers: {headers!s}')
         self.ack()
 
 

hosts/models.py

@@ -66,21 +66,21 @@ def __str__(self):
     def show(self):
         """ Show info about this host
         """
-        text = '{0!s}:\n'.format(self)
-        text += 'IP address   : {0!s}\n'.format(self.ipaddress)
-        text += 'Reverse DNS  : {0!s}\n'.format(self.reversedns)
-        text += 'Domain       : {0!s}\n'.format(self.domain)
-        text += 'OS           : {0!s}\n'.format(self.os)
-        text += 'Kernel       : {0!s}\n'.format(self.kernel)
-        text += 'Architecture : {0!s}\n'.format(self.arch)
-        text += 'Last report  : {0!s}\n'.format(self.lastreport)
-        text += 'Packages     : {0!s}\n'.format(self.get_num_packages())
-        text += 'Repos        : {0!s}\n'.format(self.get_num_repos())
-        text += 'Updates      : {0!s}\n'.format(self.get_num_updates())
-        text += 'Tags         : {0!s}\n'.format(self.tags)
-        text += 'Needs reboot : {0!s}\n'.format(self.reboot_required)
-        text += 'Updated at   : {0!s}\n'.format(self.updated_at)
-        text += 'Host repos   : {0!s}\n'.format(self.host_repos_only)
+        text = f'{self!s}:\n'
+        text += f'IP address   : {self.ipaddress!s}\n'
+        text += f'Reverse DNS  : {self.reversedns!s}\n'
+        text += f'Domain       : {self.domain!s}\n'
+        text += f'OS           : {self.os!s}\n'
+        text += f'Kernel       : {self.kernel!s}\n'
+        text += f'Architecture : {self.arch!s}\n'
+        text += f'Last report  : {self.lastreport!s}\n'
+        text += f'Packages     : {self.get_num_packages()!s}\n'
+        text += f'Repos        : {self.get_num_repos()!s}\n'
+        text += f'Updates      : {self.get_num_updates()!s}\n'
+        text += f'Tags         : {self.tags!s}\n'
+        text += f'Needs reboot : {self.reboot_required!s}\n'
+        text += f'Updated at   : {self.updated_at!s}\n'
+        text += f'Host repos   : {self.host_repos_only!s}\n'
 
         info_message.send(sender=None, text=text)
 
@@ -109,7 +109,7 @@ def check_rdns(self):
                 info_message.send(sender=None, text='Reverse DNS matches')
             else:
                 text = 'Reverse DNS mismatch found: '
-                text += '{0!s} != {1!s}'.format(self.hostname, self.reversedns)
+                text += f'{self.hostname!s} != {self.reversedns!s}'
                 info_message.send(sender=None, text=text)
         else:
             info_message.send(sender=None,
@@ -183,7 +183,7 @@ def process_update(self, package, highest_package):
         try:
             with transaction.atomic():
                 self.updates.add(update)
-            info_message.send(sender=None, text='{0!s}'.format(update))
+            info_message.send(sender=None, text=f'{update!s}')
             return update.id
         except IntegrityError as e:
             error_message.send(sender=None, text=e)
@@ -355,4 +355,4 @@ class Meta(object):
         unique_together = ('host', 'repo')
 
     def __str__(self):
-        return '{0!s}-{1!s}'.format(self.host, self.repo)
+        return f'{self.host!s}-{self.repo!s}'

hosts/templatetags/report_alert.py

@@ -37,5 +37,5 @@ def report_alert(lastreport):
     else:
         days = 14
     if lastreport < (timezone.now() - timedelta(days=days)):
-        html = '<img src="{0!s}" alt="Outdated Report" />'.format(alert_icon)
+        html = f'<img src="{alert_icon!s}" alt="Outdated Report" />'
     return format_html(html)

hosts/utils.py

@@ -55,7 +55,7 @@ def remove_reports(host, timestamp):
     del_reports = Report.objects.filter(host=host).exclude(id__in=report_ids)
 
     rlen = del_reports.count()
-    ptext = 'Cleaning {0!s} old reports'.format(rlen)
+    ptext = f'Cleaning {rlen!s} old reports'
     progress_info_s.send(sender=None, ptext=ptext, plen=rlen)
     for i, report in enumerate(del_reports):
         report.delete()

hosts/views.py

@@ -138,7 +138,7 @@ def host_edit(request, hostname):
             if edit_form.is_valid():
                 host = edit_form.save()
                 host.save()
-                text = 'Saved changes to Host {0!s}'.format(host)
+                text = f'Saved changes to Host {host!s}'
                 messages.info(request, text)
                 return redirect(host.get_absolute_url())
             else:
@@ -163,7 +163,7 @@ def host_delete(request, hostname):
     if request.method == 'POST':
         if 'delete' in request.POST:
             host.delete()
-            text = 'Host {0!s} has been deleted'.format(hostname)
+            text = f'Host {hostname!s} has been deleted'
             messages.info(request, text)
             return redirect(reverse('hosts:host_list'))
         elif 'cancel' in request.POST:

operatingsystems/views.py

@@ -74,14 +74,14 @@ def os_detail(request, os_id):
             osgroup = create_form.save()
             os.osgroup = osgroup
             os.save()
-            text = 'Created OS Group {0!s} '.format(osgroup)
-            text += 'and added OS {0!s} to it'.format(os)
+            text = f'Created OS Group {osgroup!s} '
+            text += f'and added OS {os!s} to it'
             messages.info(request, text)
             return redirect(os.get_absolute_url())
         add_form = AddOSToOSGroupForm(request.POST, instance=os, prefix='add')
         if add_form.is_valid():
             add_form.save()
-            text = 'OS {0!s} added to OS Group {1!s}'.format(os, os.osgroup)
+            text = f'OS {os!s} added to OS Group {os.osgroup!s}'
             messages.info(request, text)
             return redirect(os.get_absolute_url())
     else:
@@ -109,7 +109,7 @@ def os_delete(request, os_id):
         if 'delete' in request.POST:
             if os:
                 os.delete()
-                messages.info(request, 'OS {0!s} has been deleted'.format(os))
+                messages.info(request, f'OS {os!s} has been deleted')
                 return redirect(reverse('operatingsystems:os_list'))
             else:
                 if not oses:
@@ -118,7 +118,7 @@ def os_delete(request, os_id):
                     return redirect(reverse('operatingsystems:os_list'))
                 for os in oses:
                     os.delete()
-                text = '{0!s} OS\'s have been deleted'.format(len(oses))
+                text = f'{len(oses)!s} OS\'s have been deleted'
                 messages.info(request, text)
                 return redirect(reverse('operatingsystems:os_list'))
         elif 'cancel' in request.POST:
@@ -189,7 +189,7 @@ def osgroup_delete(request, osgroup_id):
     if request.method == 'POST':
         if 'delete' in request.POST:
             osgroup.delete()
-            text = 'OS Group {0!s} has been deleted'.format(osgroup)
+            text = f'OS Group {osgroup!s} has been deleted'
             messages.info(request, text)
             return redirect(reverse('operatingsystems:os_list'))
         elif 'cancel' in request.POST:

packages/models.py

@@ -79,18 +79,14 @@ class Meta(object):
 
     def __str__(self):
         if self.epoch:
-            epo = '{0!s}:'.format(self.epoch)
+            epo = f'{self.epoch!s}:'
         else:
             epo = ''
         if self.release:
-            rel = '-{0!s}'.format(self.release)
+            rel = f'-{self.release!s}'
         else:
             rel = ''
-        return '{0!s}-{1!s}{2!s}{3!s}-{4!s}'.format(self.name,
-                                                    epo,
-                                                    self.version,
-                                                    rel,
-                                                    self.arch)
+        return f'{self.name!s}-{epo!s}{self.version!s}{rel!s}-{self.arch!s}'
 
     def get_absolute_url(self):
         return self.name.get_absolute_url()
@@ -170,18 +166,14 @@ class Meta(object):
 
     def __str__(self):
         if self.epoch:
-            epo = '{0!s}:'.format(self.epoch)
+            epo = f'{self.epoch!s}:'
         else:
             epo = ''
         if self.release:
-            rel = '-{0!s}'.format(self.release)
+            rel = f'-{self.release!s}'
         else:
             rel = ''
-        return '{0!s}-{1!s}{2!s}{3!s}-{4!s}'.format(self.name,
-                                                    epo,
-                                                    self.version,
-                                                    rel,
-                                                    self.arch)
+        return f'{self.name!s}-{epo!s}{self.version!s}{rel!s}-{self.arch!s}'
 
     def __key(self):
         return (self.name, self.epoch, self.version, self.release, self.arch,
@@ -217,9 +209,7 @@ def __str__(self):
             update_type = 'Security'
         else:
             update_type = 'Bugfix'
-        return '{0!s} -> {1!s} ({2!s})'.format(self.oldpackage,
-                                               self.newpackage,
-                                               update_type)
+        return f'{self.oldpackage!s} -> {self.newpackage!s} ({update_type!s})'
 
 
 class ErratumReference(models.Model):
@@ -247,10 +237,8 @@ class Meta(object):
         verbose_name_plural = 'Errata'
 
     def __str__(self):
-        text = '{0!s} {1!s} ({2!s}) : '.format(self.name,
-                                               self.issue_date,
-                                               self.etype)
-        text += '{0!s} packages, '.format(self.packages.count())
-        text += '{0!s} arches, '.format(self.arches.count())
-        text += '{0!s} releases'.format(self.releases.count())
+        text = f'{self.name!s} {self.issue_date!s} ({self.etype!s}) : '
+        text += f'{self.packages.count()!s} packages, '
+        text += f'{self.arches.count()!s} arches, '
+        text += f'{self.releases.count()!s} releases'
         return text

packages/utils.py

@@ -61,12 +61,12 @@ def find_version(s, epoch, release):
     """ Given a package version string, return the version
     """
     try:
-        es = '{0!s}:'.format(epoch)
+        es = f'{epoch!s}:'
         e = s.index(es) + len(epoch) + 1
     except ValueError:
         e = 0
     try:
-        rs = '-{0!s}'.format(release)
+        rs = f'-{release!s}'
         r = s.index(rs)
     except ValueError:
         r = len(s)
@@ -117,7 +117,7 @@ def parse_errata(data, force):
     result = etree.XML(data)
     errata_xml = result.findall('*')
     elen = len(errata_xml)
-    ptext = 'Processing {0!s} Errata:'.format(elen)
+    ptext = f'Processing {elen!s} Errata:'
     progress_info_s.send(sender=None, ptext=ptext, plen=elen)
     for i, child in enumerate(errata_xml):
         progress_update_s.send(sender=None, index=i + 1)
@@ -165,7 +165,7 @@ def parse_errata_children(e, children):
         elif c.tag == 'os_release':
             from operatingsystems.models import OSGroup
             osgroups = OSGroup.objects.all()
-            osgroup_name = 'CentOS {0!s}'.format(c.text)
+            osgroup_name = f'CentOS {c.text!s}'
             with transaction.atomic():
                 osgroup, c = osgroups.get_or_create(name=osgroup_name)
             e.releases.add(osgroup)
@@ -177,11 +177,11 @@ def parse_errata_children(e, children):
                 name, epoch, ver, rel, dist, arch = m.groups()
             else:
                 e = 'Error parsing errata: '
-                e += 'could not parse package "{0!s}"'.format(pkg_str)
+                e += f'could not parse package "{pkg_str!s}"'
                 error_message.send(sender=None, text=e)
                 continue
             if dist:
-                rel = '{0!s}.{1!s}'.format(rel, dist)
+                rel = f'{rel!s}.{dist!s}'
             p_type = Package.RPM
             pkg = get_or_create_package(name, epoch, ver, rel, arch, p_type)
             e.packages.add(pkg)
@@ -291,7 +291,7 @@ def mark_errata_security_updates():
     package_updates = PackageUpdate.objects.all()
     errata = Erratum.objects.all()
     elen = Erratum.objects.count()
-    ptext = 'Scanning {0!s} Errata:'.format(elen)
+    ptext = f'Scanning {elen!s} Errata:'
     progress_info_s.send(sender=None, ptext=ptext, plen=elen)
     for i, erratum in enumerate(errata):
         progress_update_s.send(sender=None, index=i + 1)

reports/models.py

@@ -53,7 +53,7 @@ class Meta(object):
         ordering = ('-created',)
 
     def __str__(self):
-        return '{0!s} {1!s}'.format(self.host, self.created.strftime('%c'))
+        return f"{self.host!s} {self.created.strftime('%c')!s}"
 
     def get_absolute_url(self):
         return reverse('reports:report_detail', args=[str(self.id)])
@@ -146,7 +146,7 @@ def process(self, find_updates=True, verbose=False):
 
             if verbose:
                 text = 'Processing report '
-                text += '{0!s} - {1!s}'.format(self.id, self.host)
+                text += f'{self.id!s} - {self.host!s}'
                 info_message.send(sender=None, text=text)
 
             from reports.utils import process_packages, \
@@ -165,15 +165,15 @@ def process(self, find_updates=True, verbose=False):
             if find_updates:
                 if verbose:
                     text = 'Finding updates for report '
-                    text += '{0!s} - {1!s}'.format(self.id, self.host)
+                    text += f'{self.id!s} - {self.host!s}'
                     info_message.send(sender=None, text=text)
                 host.find_updates()
         else:
             if self.processed:
-                text = 'Report {0!s} '.format(self.id)
+                text = f'Report {self.id!s} '
                 text += 'has already been processed'
                 info_message.send(sender=None, text=text)
             else:
                 text = 'Error: OS, kernel or arch not sent '
-                text += 'with report {0!s}'.format(self.id)
+                text += f'with report {self.id!s}'
                 error_message.send(sender=None, text=text)

reports/utils.py

@@ -37,7 +37,7 @@ def process_repos(report, host):
         repos = parse_repos(report.repos)
 
         progress_info_s.send(sender=None,
-                             ptext='{0!s} repos'.format(str(host)[0:25]),
+                             ptext=f'{str(host)[0:25]!s} repos',
                              plen=len(repos))
         for i, repo_str in enumerate(repos):
             repo, priority = process_repo(repo_str, report.arch)
@@ -72,7 +72,7 @@ def process_packages(report, host):
 
         packages = parse_packages(report.packages)
         progress_info_s.send(sender=None,
-                             ptext='{0!s} packages'.format(str(host)[0:25]),
+                             ptext=f'{str(host)[0:25]!s} packages',
                              plen=len(packages))
         for i, pkg_str in enumerate(packages):
             package = process_package(pkg_str, report.protocol)
@@ -87,7 +87,7 @@ def process_packages(report, host):
                     error_message.send(sender=None, text=e)
             else:
                 if pkg_str[0].lower() != 'gpg-pubkey':
-                    text = 'No package returned for {0!s}'.format(pkg_str)
+                    text = f'No package returned for {pkg_str!s}'
                     info_message.send(sender=None, text=text)
             progress_update_s.send(sender=None, index=i + 1)
 
@@ -126,7 +126,7 @@ def add_updates(updates, host):
         host.updates.remove(host_update)
     ulen = len(updates)
     if ulen > 0:
-        ptext = '{0!s} updates'.format(str(host)[0:25])
+        ptext = f'{str(host)[0:25]!s} updates'
         progress_info_s.send(sender=None, ptext=ptext, plen=ulen)
 
         for i, (u, sec) in enumerate(updates.items()):
@@ -143,9 +143,7 @@ def parse_updates(updates_string, security):
     updates = {}
     ulist = updates_string.lower().split()
     while ulist:
-        name = '{0!s} {1!s} {2!s}\n'.format(ulist[0],
-                                            ulist[1],
-                                            ulist[2])
+        name = f'{ulist[0]!s} {ulist[1]!s} {ulist[2]!s}\n'
         del ulist[:3]
         updates[name] = security
     return updates

reports/views.py

@@ -138,7 +138,7 @@ def report_delete(request, report_id):
     if request.method == 'POST':
         if 'delete' in request.POST:
             report.delete()
-            text = 'Report {0!s} has been deleted'.format(report)
+            text = f'Report {report!s} has been deleted'
             messages.info(request, text)
             return redirect(reverse('reports:report_list'))
         elif 'cancel' in request.POST: