python: upgrade from .format() to f-strings

They are supported since Python 3.5.

python/tests/stress_test_db.py

@@ -59,15 +59,15 @@ def test_db_busy_error(acfactory, tmpdir):
         if report_type == ReportType.exit:
             replier.log("EXIT")
         elif report_type == ReportType.ffi_error:
-            replier.log("ERROR: {}".format(report_args[0]))
+            replier.log(f"ERROR: {report_args[0]}")
         elif report_type == ReportType.message_echo:
             continue
         else:
-            raise ValueError("{} unknown report type {}, args={}".format(addr, report_type, report_args))
+            raise ValueError(f"{addr} unknown report type {report_type}, args={report_args}")
         alive_count -= 1
         replier.log("shutting down")
         replier.account.shutdown()
-        replier.log("shut down complete, remaining={}".format(alive_count))
+        replier.log(f"shut down complete, remaining={alive_count}")
 
 
 class ReportType:
@@ -86,12 +86,12 @@ class AutoReplier:
         self.current_sent = 0
         self.addr = self.account.get_self_contact().addr
 
-        self._thread = threading.Thread(name="Stats{}".format(self.account), target=self.thread_stats)
+        self._thread = threading.Thread(name=f"Stats{self.account}", target=self.thread_stats)
         self._thread.setDaemon(True)
         self._thread.start()
 
     def log(self, message):
-        self._log("{} {}".format(self.addr, message))
+        self._log(f"{self.addr} {message}")
 
     def thread_stats(self):
         # XXX later use, for now we just quit
@@ -107,17 +107,17 @@ class AutoReplier:
             return
         message.create_chat()
         message.mark_seen()
-        self.log("incoming message: {}".format(message))
+        self.log(f"incoming message: {message}")
 
         self.current_sent += 1
         # we are still alive, let's send a reply
         if self.num_bigfiles and self.current_sent % (self.num_send / self.num_bigfiles) == 0:
-            message.chat.send_text("send big file as reply to: {}".format(message.text))
+            message.chat.send_text(f"send big file as reply to: {message.text}")
             msg = message.chat.send_file(self.account.bigfile)
         else:
-            msg = message.chat.send_text("got message id {}, small text reply".format(message.id))
+            msg = message.chat.send_text(f"got message id {message.id}, small text reply")
             assert msg.text
-        self.log("message-sent: {}".format(msg))
+        self.log(f"message-sent: {msg}")
         self.report_func(self, ReportType.message_echo)
         if self.current_sent >= self.num_send:
             self.report_func(self, ReportType.exit)

python/tests/test_1_online.py

@@ -1249,7 +1249,7 @@ def test_send_mark_seen_clean_incoming_events(acfactory, lp):
     msg = ac2._evtracker.wait_next_incoming_message()
     assert msg.text == "hello"
 
-    lp.sec("ac2: mark seen {}".format(msg))
+    lp.sec(f"ac2: mark seen {msg}")
     msg.mark_seen()
 
     for ev in ac1._evtracker.iter_events():
@@ -1437,7 +1437,7 @@ def test_import_export_online_all(acfactory, tmpdir, data, lp):
 
     backupdir = tmpdir.mkdir("backup")
 
-    lp.sec("export all to {}".format(backupdir))
+    lp.sec(f"export all to {backupdir}")
     with ac1.temp_plugin(ImexTracker()) as imex_tracker:
         ac1.stop_io()
         ac1.imex(backupdir.strpath, const.DC_IMEX_EXPORT_BACKUP)
@@ -1474,7 +1474,7 @@ def test_import_export_online_all(acfactory, tmpdir, data, lp):
     assert_account_is_proper(ac1)
     assert_account_is_proper(ac2)
 
-    lp.sec("Second-time export all to {}".format(backupdir))
+    lp.sec(f"Second-time export all to {backupdir}")
     ac1.stop_io()
     path2 = ac1.export_all(backupdir.strpath)
     assert os.path.exists(path2)

python/tests/test_2_increation.py

@@ -17,7 +17,7 @@ def wait_msg_delivered(account, msg_list):
 
 def wait_msgs_changed(account, msgs_list):
     """wait for one or more MSGS_CHANGED events to match msgs_list contents."""
-    account.log("waiting for msgs_list={}".format(msgs_list))
+    account.log(f"waiting for msgs_list={msgs_list}")
     msgs_list = list(msgs_list)
     while msgs_list:
         ev = account._evtracker.get_matching("DC_EVENT_MSGS_CHANGED")
@@ -27,7 +27,7 @@ def wait_msgs_changed(account, msgs_list):
                     del msgs_list[i]
                     break
         else:
-            account.log("waiting mismatch data1={} data2={}".format(data1, data2))
+            account.log(f"waiting mismatch data1={data1} data2={data2}")
     return ev.data1, ev.data2
 
 

python/tests/test_3_offline.py

@@ -744,7 +744,7 @@ class TestOfflineChat:
         contacts = []
         for i in range(10):
             lp.sec("create contact")
-            contact = ac1.create_contact("some{}@example.org".format(i))
+            contact = ac1.create_contact(f"some{i}@example.org")
             contacts.append(contact)
             lp.sec("add contact")
             chat.add_contact(contact)