Merge branch 'main' into main-with-fixes

src/bitmessagemain.py

@@ -325,7 +325,7 @@ class Main(object):
         if not sys.platform.startswith('win'):
             si = open(os.devnull, 'r')
             so = open(os.devnull, 'a+')
-            se = open(os.devnull, 'a+', 0)
+            se = open(os.devnull, 'ab+', 0)
             os.dup2(si.fileno(), sys.stdin.fileno())
             os.dup2(so.fileno(), sys.stdout.fileno())
             os.dup2(se.fileno(), sys.stderr.fileno())

src/bitmessageqt/dialogs.py

@@ -64,8 +64,8 @@ class IconGlossaryDialog(QtWidgets.QDialog):
 
         self.labelPortNumber.setText(_translate(
             "iconGlossaryDialog",
-            "You are using TCP port %1. (This can be changed in the settings)."
+            "You are using TCP port {0}. (This can be changed in the settings)."
-        ).arg(config.getint('bitmessagesettings', 'port')))
+        ).format(config.getint('bitmessagesettings', 'port')))
         self.setFixedSize(QtWidgets.QWidget.sizeHint(self))
 
 

src/namecoin.py

@@ -96,8 +96,8 @@ class namecoinConnection(object):
                 res = res["reply"]
                 if not res:
                     return (_translate(
-                        "MainWindow", "The name %1 was not found."
+                        "MainWindow", "The name {0} was not found."
-                    ).arg(identity.decode("utf-8", "ignore")), None)
+                    ).format(identity.decode("utf-8", "ignore")), None)
             else:
                 assert False
         except RPCError as exc:
@@ -107,12 +107,12 @@ class namecoinConnection(object):
             else:
                 errmsg = exc.error
             return (_translate(
-                "MainWindow", "The namecoin query failed (%1)"
+                "MainWindow", "The namecoin query failed ({0})"
-            ).arg(errmsg.decode("utf-8", "ignore")), None)
+            ).format(errmsg.decode("utf-8", "ignore")), None)
         except AssertionError:
             return (_translate(
-                "MainWindow", "Unknown namecoin interface type: %1"
+                "MainWindow", "Unknown namecoin interface type: {0}"
-            ).arg(self.nmctype.decode("utf-8", "ignore")), None)
+            ).format(self.nmctype.decode("utf-8", "ignore")), None)
         except Exception:
             logger.exception("Namecoin query exception")
             return (_translate(
@@ -135,8 +135,8 @@ class namecoinConnection(object):
         ) if valid else (
             _translate(
                 "MainWindow",
-                "The name %1 has no associated Bitmessage address."
+                "The name {0} has no associated Bitmessage address."
-            ).arg(identity.decode("utf-8", "ignore")), None)
+            ).format(identity.decode("utf-8", "ignore")), None)
 
     def test(self):
         """
@@ -164,7 +164,7 @@ class namecoinConnection(object):
                     "success",
                     _translate(
                         "MainWindow",
-                        "Success!  Namecoind version %1 running.").arg(
+                        "Success!  Namecoind version {0} running.").format(
                             versStr.decode("utf-8", "ignore")))
 
             elif self.nmctype == "nmcontrol":

src/network/tcp.py

@@ -138,9 +138,9 @@ class TCPConnection(BMProto, TLSDispatcher):
                 'updateStatusBar',
                 _translate(
                     "MainWindow",
-                    "The time on your computer, %1, may be wrong. "
+                    "The time on your computer, {0}, may be wrong. "
                     "Please verify your settings."
-                ).arg(l10n.formatTimestamp())))
+                ).format(l10n.formatTimestamp())))
 
     def state_connection_fully_established(self):
         """

src/upnp.py

@@ -269,8 +269,8 @@ class uPnPThread(StoppableThread):
                                 knownnodes.addKnownNode(
                                     1, self_peer, is_self=True)
                         queues.UISignalQueue.put(('updateStatusBar', tr._translate(
-                            "MainWindow", 'UPnP port mapping established on port %1'
+                            "MainWindow", 'UPnP port mapping established on port {0}'
-                        ).arg(str(self.extPort))))
+                        ).format(self.extPort)))
                         break
             except socket.timeout:
                 pass