python3 fix: bytes vs strings..

git-svn-id: https://xpra.org/svn/Xpra/trunk@6179 3bb7dfac-3a0b-4e04-842a-767bc560f471

src/xpra/client/client_base.py

@@ -44,6 +44,14 @@
 DETECT_LEAKS = os.environ.get("XPRA_DETECT_LEAKS", "0")=="1"
 
 
+if sys.version < '3':
+    def b(x):
+        return x
+else:
+    def b(x):
+        return bytes(x, 'UTF-8')
+
+
 class XpraClientBase(object):
     """ Base class for Xpra clients.
         Provides the glue code for:
@@ -195,7 +203,7 @@ def send_hello(self, challenge_response=None, client_salt=None):
             hello["challenge_response"] = challenge_response
             if client_salt:
                 hello["challenge_client_salt"] = client_salt
-        log.debug("send_hello(%s) packet=%s", binascii.hexlify(challenge_response or ""), hello)
+        log.debug("send_hello(%s) packet=%s", binascii.hexlify(b(challenge_response or "", 'UTF-8')), hello)
         self.send("hello", hello)
         self.timeout_add(DEFAULT_TIMEOUT, self.verify_connected)