From a62082e704de8af154e7b2023a23f160db85ccc7 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Sun, 27 Apr 2014 04:57:45 +0000 Subject: [PATCH] more python3 string fixes: only convert to bytes when needed git-svn-id: https://xpra.org/svn/Xpra/trunk@6183 3bb7dfac-3a0b-4e04-842a-767bc560f471 --- src/xpra/net/protocol.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/xpra/net/protocol.py b/src/xpra/net/protocol.py index e46e7ddc30..bf9ddd05d4 100644 --- a/src/xpra/net/protocol.py +++ b/src/xpra/net/protocol.py @@ -79,7 +79,9 @@ def lz4_compress(packet, level): long = int #@ReservedAssignment unicode = str #@ReservedAssignment def zcompress(packet, level): - return level + ZLIB_FLAG, compress(bytes(packet, 'UTF-8'), level) + if type(packet)!=bytes: + packet = bytes(packet, 'UTF-8') + return level + ZLIB_FLAG, compress(packet, level) else: def zcompress(packet, level): return level + ZLIB_FLAG, compress(str(packet), level)