ensure this function only returns strings (not unicode)

git-svn-id: https://xpra.org/svn/Xpra/trunk@9660 3bb7dfac-3a0b-4e04-842a-767bc560f471
Xpra-org · Jun 18, 2015 · 728c2a4 · 728c2a4
1 parent 3548957
commit 728c2a4
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/xpra/platform/xposix/keyboard.py b/src/xpra/platform/xposix/keyboard.py
@@ -95,7 +95,12 @@ def get_layout_spec(self):
         if v:
             layouts = v.split(",")
             layout = v
-        return layout, layouts, "", None
+        def s(v):
+            try:
+                return s.encode("ascii")
+            except:
+                return str(s)
+        return s(layout), [s(x) for x in layouts], b"", None
 
 
     def get_keyboard_repeat(self):