cont f-strings

Author: WolfgangWaltenberger

smodels/tools/databaseClient.py

@@ -43,7 +43,7 @@ def send_shutdown ( self ):
         self.send ( "shutdown", amount_expected = 0 )
 
     def saveStats ( self ):
-        self.pprint ( "client stats after %d queries" % self.nqueries )
+        self.pprint ( f"client stats after {self.nqueries} queries" )
         self.pprint ( "=================================" )
         self.pprint ( f"number of results in cache: {len(self.cache)}" )
         maxhits=[]
@@ -124,8 +124,7 @@ def send ( self, message, amount_expected=32 ):
                 except (ConnectionRefusedError,ConnectionResetError,BrokenPipeError,ConnectionAbortedError) as e:
                     dt = self.getWaitingTime()
                     self.ntries += 1
-                    self.log ( 'could not connect to %s. trying again in %d seconds' % \
-                               ( self.nameAndPort(), dt ) )
+                    self.log ( f'could not connect to {self.nameAndPort()}. trying again in {dt} seconds' )
                     time.sleep ( dt )
             self.pprint ( f"could not connect in send, after trying {self.ntries} times. aborting" )
             raise SModelSError ( f"Could not connect to database in send, tried {self.ntries} times" )
@@ -158,23 +157,26 @@ def findServerStatus ( self ):
     def log ( self, *args ):
         if type(self.verbose)==str or self.verbose > 35:
             self.setDefaults()
-            print ( "[databaseClient%d] %s" % ( self.clientid, " ".join(map(str,args)) ) )
+            s_args = ' '.join(map(str,args))
+            print ( f"[databaseClient{self.clientid}] {s_args}" )
             with open ( self.logfile, "at" ) as f:
-                f.write ( "[databaseClient%d-%s] %s\n" % \
-                     ( self.clientid, time.strftime("%H:%M:%S"), " ".join(map(str,args)) ) )
+                asctime = time.strftime("%H:%M:%S")
+                f.write ( f"[databaseClient{self.clientid}-{asctime}] {s_args}\n" )
                 f.close()
 
     def pprint ( self, *args ):
         if type(self.verbose)==str or self.verbose > 25:
             self.setDefaults()
-            print ( f"[databaseClient{self.clientid}] {' '.join(map(str,args))}" )
+            s_args = ' '.join(map(str,args))
+            print ( f"[databaseClient{self.clientid}] {s_args}" )
+            print ( f"[databaseClient{self.clientid}] {s_args}" )
             with open ( self.logfile, "at" ) as f:
-                f.write ( "[databaseClient%d-%s] %s\n" % \
-                      ( self.clientid, time.strftime("%H:%M:%S"), " ".join(map(str,args)) ) )
+                asctime = time.strftime("%H:%M:%S")
+                f.write ( f"[databaseClient{self.clientid}-{asctime}] {s_args}\n" )
                 f.close()
 
     def nameAndPort ( self ):
-        return "%s:%d" % ( self.servername, self.port )
+        return f"{self.servername}:{self.port}"
 
     def initialize( self ):
         if hasattr ( self, "sock" ):
@@ -195,19 +197,18 @@ def initialize( self ):
             except (socket.timeout,OSError,ConnectionRefusedError,ConnectionResetError,BrokenPipeError,ConnectionAbortedError) as e:
                 dt = self.getWaitingTime()
                 self.ntries += 1
-                self.log ( 'could not connect to %s after %d times. trying again in %d seconds' % \
-                           ( self.nameAndPort(), self.ntries, dt ) )
+                self.log ( f'could not connect to {self.nameAndPort()} after {self.ntries} times. trying again in {dt} seconds' )
                 time.sleep ( dt )
         self.pprint ( f'could not connect to database in initialize, after trying {self.ntries} times. aborting' )
-        raise SModelSError ( "Could not connect to database in initialize, tried %d times" % self.ntries )
+        raise SModelSError ( f"Could not connect to database in initialize, tried {self.ntries} times" )
 
 
 def stresstest( args ):
     """ this is one process in the stress test """
     verbosity, servername, port = "error", args[0], args[1]
     nr = args[2]
     client = DatabaseClient ( servername, port, verbose = verbosity,
-                              logfile="@@rundir@@/dbclient%d.log" % nr,
+                              logfile=f"@@rundir@@/dbclient{nr}.log",
                               clientid = nr )
     mmother = random.uniform ( 200, 900 )
     mlsp = random.uniform ( 0, mmother )
@@ -217,9 +218,8 @@ def stresstest( args ):
             mlsp = random.uniform ( 0, mmother )
         msg = "obs:ATLAS-SUSY-2017-01:SRHad-Low:TChiWH:[[%.2f,%.2f],[%.2f,%.2f]]" % \
                ( mmother, mlsp, mmother, mlsp )
-        # print ( "client #%d" % pid )
         client.query ( msg )
-    print ( "finished %d" % nr )
+    print ( f"[stresstest] finished {nr}" )
 
 if __name__ == "__main__":
     import argparse

smodels/tools/databaseServer.py

@@ -80,7 +80,7 @@ def logServerStats ( self ):
         """ log our stats upon exit """
         self.pprint ( "server stats" )
         self.pprint ( "============" )
-        self.pprint ( "total number of lookups: %d" % self.nlookups )
+        self.pprint ( f"total number of lookups: {self.nlookups}" )
 
     def shutdown ( self, fromwhere = "unknown" ):
         self.pprint ( f"Received shutdown request from {fromwhere}" )
@@ -173,8 +173,7 @@ def listen ( self ):
                 if data:
                     self.parseData ( str(data) )
                 else:
-                    self.log ( 'no more data from %s:%s' % \
-                               ( self.client_address[0], self.client_address[1] ) )
+                    self.log ( f'no more data from {self.client_address[0]}:{self.client_address[1]}' )
                     break
         finally:
             # Clean up the connection
@@ -184,16 +183,16 @@ def log ( self, *args ):
         if self.verbose > 35:
             print ( "[databaseServer]", " ".join(map(str,args)) )
             with open ( self.logfile, "at" ) as f:
-                f.write ( "[databaseServer-%s] %s\n" % \
-                          ( time.strftime("%H:%M:%S"), " ".join(map(str,args)) ) )
+                asctime = time.strftime("%H:%M:%S")
+                f.write(f"[databaseServer-{asctime}] {' '.join(map(str,args))}\n")
                 f.close()
 
     def pprint ( self, *args ):
         if self.verbose > 25:
             print ( "[databaseServer]", " ".join(map(str,args)) )
             with open ( self.logfile, "at" ) as f:
-                f.write ( "[databaseServer-%s] %s\n" % \
-                          ( time.strftime("%H:%M:%S"), " ".join(map(str,args)) ) )
+                asctime = time.strftime("%H:%M:%S")
+                f.write(f"[databaseServer-{asctime}] {' '.join(map(str,args))}\n")
                 f.close()
 
     def initialize( self ):