match switch to strings, add missing type hint

Xpra-org · Jul 16, 2023 · 5529e73 · 5529e73
1 parent 102ead7
commit 5529e73
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/xpra/server/dbus/dbus_start.py b/xpra/server/dbus/dbus_start.py
@@ -7,7 +7,7 @@
 import os
 import shlex
 from subprocess import Popen, PIPE
-from typing import Tuple
+from typing import Tuple, Dict
 
 from xpra.os_util import POSIX
 from xpra.scripts.config import FALSE_OPTIONS

diff --git a/xpra/x11/x11_server_base.py b/xpra/x11/x11_server_base.py
@@ -134,10 +134,10 @@ def configure_best_screen_size(self) -> Tuple[int,int]:
         return root_w, root_h
 
 
-    def init_dbus(self, dbus_pid:int, dbus_env:Dict[bytes,bytes]) -> None:
+    def init_dbus(self, dbus_pid:int, dbus_env:Dict[str,str]) -> None:
         dbuslog("init_dbus(%s, %s)", dbus_pid, dbus_env)
         if dbus_pid and dbus_env:
-            os.environb.update(dbus_env)
+            os.environ.update(dbus_env)
             self.dbus_pid = dbus_pid
             self.dbus_env = dbus_env
             #now we can save values on the display
@@ -154,7 +154,7 @@ def _save_str(prop_name, s):
                     ("PID",         int,            _save_int),
                     ("WINDOW_ID",   int,            _save_int)):
                 k = f"DBUS_SESSION_BUS_{n}"
-                v = dbus_env.get(strtobytes(k))
+                v = dbus_env.get(k)
                 if v is None:
                     continue
                 try: