Convert.format() to f-strings with flynt

1 files changed, 17 insertions, 17 deletions

diff --git a/databaseReset.py b/databaseReset.py
index 0ab5cf1..630d3c6 100644
--- a/databaseReset.py
+++ b/databaseReset.py
@@ -26,13 +26,13 @@ print(" - settings on loading databaseReset.py")
 
 import django
 
-print(" - Memory footprint before loading Django: {:.3f} MB".format(resource.getrusage(resource.RUSAGE_SELF)[2]/1024.0))
+print(f" - Memory footprint before loading Django: {resource.getrusage(resource.RUSAGE_SELF)[2] / 1024.0:.3f} MB")
 try:
     django.setup()
 except:
     print(" ! Cyclic reference failure. Can occur when the initial db is empty. Fixed now (in UploadFileForm) but easy to reintroduce..")
     raise
-print(" - Memory footprint after loading Django: {:.3f} MB".format(resource.getrusage(resource.RUSAGE_SELF)[2]/1024.0))
+print(f" - Memory footprint after loading Django: {resource.getrusage(resource.RUSAGE_SELF)[2] / 1024.0:.3f} MB")
 
 from troggle.core.models.troggle import DataIssue
 import troggle.core.models.survex
@@ -93,10 +93,10 @@ def reinit_db():
         # this is now completely failing to nuke MariaDB adequately, and it crashes when creating Area objects with a no null parent message
         # when null parents are explciitly allowed in the model.
         cursor = django.db.connection.cursor()
-        cursor.execute("DROP DATABASE %s" % currentdbname)
-        cursor.execute("CREATE DATABASE %s" % currentdbname)
-        cursor.execute("ALTER DATABASE %s CHARACTER SET=utf8" % currentdbname)
-        cursor.execute("USE %s" % currentdbname)
+        cursor.execute(f"DROP DATABASE {currentdbname}")
+        cursor.execute(f"CREATE DATABASE {currentdbname}")
+        cursor.execute(f"ALTER DATABASE {currentdbname} CHARACTER SET=utf8")
+        cursor.execute(f"USE {currentdbname}")
         print(f" - Nuked : {currentdbname}\n")
 
     print(" - Migrating: " + django.db.connections.databases['default']['NAME'])
@@ -117,7 +117,7 @@ def reinit_db():
     with transaction.atomic():
         try:
             print(" - Setting up expo user on: " + django.db.connections.databases['default']['NAME'])
-            print(" - user: {} ({:.5}...) <{}> ".format(expouser, expouserpass, expouseremail))
+            print(f" - user: {expouser} ({expouserpass:.5}...) <{expouseremail}> ")
             user = User.objects.create_user(expouser, expouseremail, expouserpass)
             user.is_staff = False
             user.is_superuser = False
@@ -136,7 +136,7 @@ def reinit_db():
     with transaction.atomic():
         try:
             print(" - Setting up expoadmin user on: " + django.db.connections.databases['default']['NAME'])
-            print(" - user: {} ({:.5}...) <{}> ".format(expoadminuser, expoadminuserpass, expoadminuseremail))
+            print(f" - user: {expoadminuser} ({expoadminuserpass:.5}...) <{expoadminuseremail}> ")
             user = User.objects.create_user(expoadminuser, expoadminuseremail, expoadminuserpass)
             user.is_staff = True
             user.is_superuser = True
@@ -157,7 +157,7 @@ def memdumpsql(fn):
     from dump import _iterdump
     with open(fn, 'w') as f:
         for line in _iterdump(djconn):
-            f.write('%s\n' % line.encode("utf8"))
+            f.write(f"{line.encode('utf8')}\n")
     return True
 
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 
@@ -195,7 +195,7 @@ class JobQueue():
                 for j in data:
                     self.results[j] = data[j]
             except:
-                print("FAILURE parsing JSON file %s" % (self.tfile))
+                print(f"FAILURE parsing JSON file {self.tfile}")
                 # Python bug: https://github.com/ShinNoNoir/twitterwebsearch/issues/12
             f.close()
         for j in self.results_order:
@@ -229,7 +229,7 @@ class JobQueue():
         print("** Running job ", self.runlabel,end=" to ")
         print(django.db.connections.databases['default']['NAME'])
         jobstart = time.time()
-        print("-- Initial memory in use {:.3f} MB".format(get_process_memory()))
+        print(f"-- Initial memory in use {get_process_memory():.3f} MB")
         self.results["date"].pop()
         self.results["date"].append(jobstart)
         self.results["runlabel"].pop()
@@ -244,14 +244,14 @@ class JobQueue():
             memend = get_process_memory()
             duration = time.time()-start
             #print(" - MEMORY start:{:.3f} MB end:{:.3f} MB change={:.3f} MB".format(memstart,memend, ))
-            print("\n*- Ended \"",  runfunction[0], "\"  {:.1f} seconds + {:.3f} MB ({:.3f} MB)".format(duration, memend-memstart, memend))
+            print("\n*- Ended \"",  runfunction[0], f"\"  {duration:.1f} seconds + {memend - memstart:.3f} MB ({memend:.3f} MB)")
             self.results[runfunction[0]].pop()  # the null item
             self.results[runfunction[0]].append(duration)
                
 
         jobend = time.time()
         jobduration = jobend-jobstart
-        print("** Ended job   %s  -  %.1f seconds total." % (self.runlabel,jobduration))
+        print(f"** Ended job   {self.runlabel}  -  {jobduration:.1f} seconds total.")
         return True
 
 
@@ -310,13 +310,13 @@ class JobQueue():
                             else:
                                 s = 0
                             days = (s)/(24*60*60)
-                            print('%8.2f' % days, end=' ')
+                            print(f'{days:8.2f}', end=' ')
                 elif r[i]: 
-                    print('%8.1f' % r[i], end=' ')
+                    print(f'{r[i]:8.1f}', end=' ')
                     if i == len(r)-1 and r[i-1]:
                         percen = 100* (r[i] - r[i-1])/r[i-1]
                         if abs(percen) >0.1:
-                            print('%8.1f%%' % percen, end=' ')
+                            print(f'{percen:8.1f}%', end=' ')
                 else:
                     print("      - ", end=' ')
             print("")
@@ -441,7 +441,7 @@ if __name__ == "__main__":
         exit()
     else:
         usage()
-        print("%s not recognised as a command." % sys.argv[1])
+        print(f"{sys.argv[1]} not recognised as a command.")
         exit()
 
     jq.run()