freewvs.git

@@ -45,19 +45,18 @@ def vulnprint(appname, version, safeversion, vuln, vfilename, subdir,

               xml):

     appdir = '/'.join(os.path.abspath(vfilename).split('/')[:-1 - subdir])

     if not xml:

-        print("%(appname)s %(version)s (%(safeversion)s) %(vuln)s "

-              "%(appdir)s" % vars())

+        print(f"{appname} {version} ({safeversion}) {vuln} {appdir}")

     else:

         state = 'vulnerable'

         if safeversion == 'ok':

             state = 'ok'

-        print('  <app state="%s">' % state)

-        print('    <appname>%s</appname>' % escape(appname))

-        print('    <version>%s</version>' % escape(version))

-        print('    <directory>%s</directory>' % escape(appdir))

+        print(f'  <app state="{state}">')

+        print(f'    <appname>{escape(appname)}</appname>')

+        print(f'    <version>{escape(version)}</version>')

+        print(f'    <directory>{escape(appdir)}</directory>')

         if state == 'vulnerable':

-            print('    <safeversion>%s</safeversion>' % escape(safeversion))

-            print('    <vulninfo>%s</vulninfo>' % escape(vuln))

+            print(f'    <safeversion>{escape(safeversion)}</safeversion>')

+            print(f'    <vulninfo>{escape(vuln)}</vulninfo>')

         print('  </app>')