#2286 better backwards compatibility: ensure we always have a default…

… value, not None git-svn-id: https://xpra.org/svn/Xpra/trunk@22571 3bb7dfac-3a0b-4e04-842a-767bc560f471
Xpra-org · Apr 30, 2019 · 1b2d2da · 1b2d2da
1 parent 490bba4
commit 1b2d2da
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/src/xpra/client/client_window_base.py b/src/xpra/client/client_window_base.py
@@ -222,12 +222,12 @@ def set_metadata(self, metadata):
                     #perform metadata variable substitutions:
                     #full of py3k unicode headaches that don't need to be
                     default_values = {
-                                      "title"           : "<untitled window>",
-                                      "client-machine"  : "<unknown machine>",
-                                      "windowid"        : str(self._id),
-                                      "server-machine"  : getattr(self._client, "_remote_hostname", "<unknown machine>"),
-                                      "server-display"  : getattr(self._client, "_remote_display", "<unknown display>"),
-                                      }
+                        "title"           : "<untitled window>",
+                        "client-machine"  : "<unknown machine>",
+                        "windowid"        : str(self._id),
+                        "server-machine"  : getattr(self._client, "_remote_hostname", None) or "<unknown machine>",
+                        "server-display"  : getattr(self._client, "_remote_display", None) or "<unknown display>",
+                        }
                     def metadata_replace(match):
                         atvar = match.group(0)          #ie: '@title@'
                         var = atvar[1:len(atvar)-1]     #ie: 'title'