python3 fix: no need to check for unicode..

git-svn-id: https://xpra.org/svn/Xpra/trunk@6314 3bb7dfac-3a0b-4e04-842a-767bc560f471
Xpra-org · May 2, 2014 · fa9643f · fa9643f
1 parent b6f860a
commit fa9643f
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/src/xpra/client/ui_client_base.py b/src/xpra/client/ui_client_base.py
@@ -48,10 +48,6 @@
 UNGRAB_KEY = os.environ.get("XPRA_UNGRAB_KEY", "Escape")
 
 
-if sys.version > '3':
-    unicode = str           #@ReservedAssignment
-
-
 """
 Utility superclass for client classes which have a UI.
 See gtk_client_base and its subclasses.

diff --git a/src/xpra/os_util.py b/src/xpra/os_util.py
@@ -61,7 +61,7 @@ def strtobytes(x):
             return x
         return x.encode()
     def bytestostr(x):
-        if type(x) in (str, unicode):
+        if type(x)==str:
             return x
         return x.decode()