protocol/rq: fix Python 3 warnings about array.tostring()

benoit-pierre · benoit-pierre · commit 2729e5ebb690 · 2017-09-06T23:14:55.000+02:00
diff --git a/NEWS b/NEWS
@@ -10,6 +10,7 @@
 - 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)
+- fix Python 3 warnings about `array.tostring()` (deprecated)
 
 ** Misc
 
diff --git a/Xlib/protocol/rq.py b/Xlib/protocol/rq.py
@@ -27,7 +27,7 @@
 import types
 
 # Python 2/3 compatibility.
-from six import binary_type, byte2int, indexbytes, iterbytes
+from six import PY3, binary_type, byte2int, indexbytes, iterbytes
 
 # Xlib modules
 from .. import X
@@ -37,6 +37,13 @@
 def decode_string(bs):
     return bs.decode('ascii')
 
+if PY3:
+    def encode_array(a):
+        return a.tobytes()
+else:
+    def encode_array(a):
+        return a.tostring()
+
 
 class BadDataError(Exception): pass
 
@@ -553,8 +560,8 @@ def pack_value(self, val):
         if self.type.structcode and len(self.type.structcode) == 1:
             if self.type.check_value is not None:
                 val = [self.type.check_value(v) for v in val]
-            data = array(struct_to_array_codes[self.type.structcode],
-                               val).tostring()
+            a = array(struct_to_array_codes[self.type.structcode], val)
+            data = encode_array(a)
         else:
             data = []
             for v in val:
@@ -686,7 +693,8 @@ def pack_value(self, value):
                 val = list(val)
 
             size = fmt // 8
-            data = array(array_unsigned_codes[size], val).tostring()
+            a = array(array_unsigned_codes[size], val)
+            data = encode_array(a)
             dlen = len(val)
 
         dl = len(data)
@@ -807,7 +815,7 @@ def pack_value(self, value):
             for i in range(len(v), keycodes):
                 a.append(X.NoSymbol)
 
-        return a.tostring(), len(value), keycodes
+        return encode_array(a), len(value), keycodes
 
 
 class ModifierMapping(ValueField):
@@ -838,7 +846,7 @@ def pack_value(self, value):
             for i in range(len(v), keycodes):
                 a.append(0)
 
-        return a.tostring(), len(value), keycodes
+        return encode_array(a), len(value), keycodes
 
 class EventField(ValueField):
     structcode = None
