protocol/rq: fix string decoding when using Python 3

benoit-pierre · benoit-pierre · commit d303d1e4e63e · 2017-09-06T23:14:55.000+02:00
X11 text strings are encoded with the Host Portable
Character Encoding, which means we should be using
ASCII, the same as the default with Python 2, and
not UTF-8.
diff --git a/NEWS b/NEWS
@@ -9,6 +9,7 @@
 - fix unclosed file in Xauth implementation
 - fix support for `Window.set_wm_transient_for`
 - fix support for `Drawable.put_image` / `Drawable.get_image`
+- use ASCII for decoding strings in Python 3 (same as Python 2)
 
 ** Misc
 
diff --git a/Xlib/protocol/rq.py b/Xlib/protocol/rq.py
@@ -34,6 +34,10 @@
 from ..support import lock
 
 
+def decode_string(bs):
+    return bs.decode('ascii')
+
+
 class BadDataError(Exception): pass
 
 # These are struct codes, we know their byte sizes
@@ -424,17 +428,14 @@ def pack_value(self, val):
 
     def parse_binary_value(self, data, display, length, format):
         if length is None:
-            return data.decode(), b''
+            return decode_string(data), b''
 
         if self.pad:
             slen = length + ((4 - length % 4) % 4)
         else:
             slen = length
 
-        if sys.version_info < (3, 0):
-            data_str = data[:length]
-        else:
-            data_str = data[:length].decode()
+        data_str = decode_string(data[:length])
 
         return data_str, data[slen:]
 
@@ -903,7 +904,7 @@ def pack_value(self, val):
 
     def parse_binary(self, data, display):
         slen = byte2int(data) + 1
-        return data[1:slen].decode(), data[slen:]
+        return decode_string(data[1:slen]), data[slen:]
 
 Str = StrClass()
 
