merge branche "@"

sat_frontends/bridge/pb.py

@@ -140,29 +140,15 @@ class Bridge(object):
     def bridgeConnect(self, callback, errback):
         factory = pb.PBClientFactory()
         conf = config.parseMainConf()
-        conn_type = config.getConfig(
-            conf,
-            "",
-            "bridge_pb_connection_type",
-            "unix_socket"
-        )
+        getConf = partial(config.getConf, conf, "bridge_pb", "")
+        conn_type = getConf("connection_type", "unix_socket")
         if conn_type == "unix_socket":
             local_dir = Path(config.getConfig(conf, "", "local_dir")).resolve()
             socket_path = local_dir / "bridge_pb"
             reactor.connectUNIX(str(socket_path), factory)
         elif conn_type == "socket":
-            host = int(config.getConfig(
-                conf,
-                "",
-                "bridge_pb_host",
-                "localhost"
-            ))
-            port = int(config.getConfig(
-                conf,
-                "",
-                "bridge_pb_port",
-                8789
-            ))
+            host = getConf("host", "localhost")
+            port = int(getConf("port", 8789))
             reactor.connectTCP(host, port, factory)
         else:
             raise ValueError(f"Unknown pb connection type: {conn_type!r}")