fstrings

Author: WolfgangWaltenberger

smodels/tools/databaseClient.py

@@ -25,16 +25,15 @@ def __init__ ( self, servername = None, port = None, verbose = "info",
         self.packetlength = 256
         if port == None:
             port = 31770
-            self.pprint ( "using default port %d" % port )
+            self.pprint ( f"using default port {port}" )
         self.port = port
         if servername == None:
             servername = socket.gethostname()
             self.pprint ( f"determined servername as '{servername}'" )
         self.servername = servername
         self.maxtries = 25 ## max numbers of trying to connect
         sstatus = self.findServerStatus()
-        self.pprint ( "connecting to %s port %s, rundir is %s. server status is '%s'" % \
-                      ( self.servername, self.port, self.rundir, sstatus ) )
+        self.pprint ( f"connecting to {self.servername} port {self.port}, rundir is {self.rundir}. server status is '{sstatus}'" )
         if "SLURM_JOB_ID" in os.environ:
             self.pprint ( f"slurm job id is {os.environ['SLURM_JOB_ID']}" )
 
@@ -50,8 +49,8 @@ def saveStats ( self ):
         maxhits=[]
         for i in self.cache.values():
             maxhits.append ( i[1] )
-        self.pprint ( "highest number of hits: %d" % max(maxhits))
-        self.pprint ( "lowest number of hits: %d" % min(maxhits))
+        self.pprint ( f"highest number of hits: {max(maxhits)}" )
+        self.pprint ( f"lowest number of hits: {min(maxhits)}" )
 
     def getWaitingTime ( self ):
         """ compute a waiting time between attempts, from self.ntries """
@@ -168,7 +167,7 @@ def log ( self, *args ):
     def pprint ( self, *args ):
         if type(self.verbose)==str or self.verbose > 25:
             self.setDefaults()
-            print ( "[databaseClient%d] %s" % ( self.clientid, " ".join(map(str,args)) ) )
+            print ( f"[databaseClient{self.clientid}] {' '.join(map(str,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)) ) )

smodels/tools/databaseServer.py

@@ -202,7 +202,7 @@ def initialize( self ):
         self.expResults = self.db.expResultList
         self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
         self.server_address = ( self.servername, self.port )
-        self.pprint ( 'starting up on %s port %s' % self.server_address )
+        self.pprint ( f'starting up on {self.servername} port {self.port}' )
         self.pprint ( f'I will be serving database {self.db.databaseVersion} at {self.dbpath}' )
         try:
             self.sock.bind( self.server_address )