simplify unicode py3k mess

git-svn-id: https://xpra.org/svn/Xpra/trunk@7624 3bb7dfac-3a0b-4e04-842a-767bc560f471
Xpra-org · Sep 15, 2014 · 48e6253 · 48e6253
1 parent c5361c9
commit 48e6253
Showing 1 changed file with 6 additions and 13 deletions.
diff --git a/src/xpra/client/client_window_base.py b/src/xpra/client/client_window_base.py
@@ -6,7 +6,6 @@
 # later version. See the file COPYING for details.
 
 import re
-import sys
 
 from xpra.client.client_widget_base import ClientWidgetBase
 from xpra.util import typedict, bytestostr
@@ -16,14 +15,6 @@
 focuslog = Logger("focus")
 mouselog = Logger("mouse")
 
-if sys.version < '3':
-    import codecs
-    def u(x):
-        return codecs.unicode_escape_decode(x)[0]
-else:
-    def u(x):
-        return x
-
 
 class ClientWindowBase(ClientWidgetBase):
 
@@ -107,6 +98,7 @@ def is_OR(self):
 
 
     def update_metadata(self, metadata):
+        log("update_metadata(%s)", metadata)
         #normalize window-type:
         window_type = metadata.strlistget("window-type")
         if window_type is not None:
@@ -121,17 +113,18 @@ def update_metadata(self, metadata):
         self.set_metadata(metadata)
 
     def set_metadata(self, metadata):
+        log("set_metadata(%s)", metadata)
         if b"title" in metadata:
             try:
-                title = u(self._client.title)
+                title = bytestostr(self._client.title)
                 if title.find("@")>=0:
                     #perform metadata variable substitutions:
-                    default_values = {"title"           : bytestostr("<untitled window>"),
-                                      "client-machine"  : bytestostr("<unknown machine>")}
+                    default_values = {"title"           : "<untitled window>",
+                                      "client-machine"  : "<unknown machine>"}
                     def metadata_replace(match):
                         atvar = match.group(0)          #ie: '@title@'
                         var = atvar[1:len(atvar)-1]     #ie: 'title'
-                        default_value = default_values.get(var, u("<unknown %s>") % var)
+                        default_value = default_values.get(var, "<unknown %s>" % var)
                         value = self._metadata.strget(var, default_value)
                         return value
                     title = re.sub("@[\w\-]*@", metadata_replace, title)