protocol: Python 3 support

benoit-pierre · benoit-pierre · commit b4a94dc897a3 · 2016-06-27T13:19:56.000+02:00
diff --git a/Xlib/protocol/display.py b/Xlib/protocol/display.py
@@ -25,6 +25,9 @@
 import errno
 import socket
 
+# Python 2/3 compatibility.
+from six import PY3, byte2int, indexbytes
+
 # Xlib modules
 from .. import error
 from ..ext import ge
@@ -35,6 +38,15 @@
 from . import rq
 from . import event
 
+if PY3:
+    def buffer(object, offset=None, size=None):
+        if offset is None:
+            offset = 0
+        if size is None:
+            size = len(object)-offset
+        return memoryview(object)[offset:offset+size]
+
+
 class Display(object):
     resource_classes = {}
     extension_major_opcodes = {}
@@ -84,8 +96,8 @@ def __init__(self, display = None):
         # Data used by the send-and-recieve loop
         self.sent_requests = []
         self.recv_packet_len = 0
-        self.data_send = ''
-        self.data_recv = ''
+        self.data_send = b''
+        self.data_recv = b''
         self.data_sent_bytes = 0
 
         # Resource ID structures
@@ -557,7 +569,7 @@ def send_and_recv(self, flush = None, event = None, request = None, recv = None)
                         self.close_internal('server')
                         raise self.socket_error
 
-                    self.data_recv = self.data_recv + bytes_recv
+                    self.data_recv = bytes(self.data_recv) + bytes_recv
                     gotreq = self.parse_response(request)
 
                 # Otherwise return, allowing the calling thread to figure
@@ -642,7 +654,7 @@ def parse_response(self, request):
         while 1:
             if self.data_recv:
                 # Check the first byte to find out what kind of response it is
-                rtype = ord(self.data_recv[0])
+                rtype = byte2int(self.data_recv)
 
             # Are we're waiting for additional data for the current packet?
             if self.recv_packet_len:
@@ -681,7 +693,7 @@ def parse_response(self, request):
 
     def parse_error_response(self, request):
         # Code is second byte
-        code = ord(self.data_recv[1])
+        code = indexbytes(self.data_recv, 1)
 
         # Fetch error class
         estruct = self.error_classes.get(code, error.XError)
diff --git a/Xlib/protocol/rq.py b/Xlib/protocol/rq.py
@@ -23,6 +23,9 @@
 from array import array
 import types
 
+# Python 2/3 compatibility.
+from six import byte2int, indexbytes, string_types
+
 # Xlib modules
 from .. import X
 from ..support import lock
@@ -654,14 +657,15 @@ def pack_value(self, value):
         if fmt not in (8, 16, 32):
             raise BadDataError('Invalid property data format {0}'.format(fmt))
 
-        if type(val) in [bytes, str]:
+        if isinstance(val, string_types):
+            val = val.encode()
             size = fmt // 8
             vlen = len(val)
             if vlen % size:
                 vlen = vlen - vlen % size
-                data = val[:vlen].encode()
+                data = val[:vlen]
             else:
-                data = val.encode()
+                data = val
 
             dlen = vlen // size
 
@@ -836,10 +840,10 @@ def pack_value(self, value):
     def parse_binary_value(self, data, display, length, format):
         from . import event
 
-        estruct = display.event_classes.get(_to_ord(data[0]) & 0x7f, event.AnyEvent)
+        estruct = display.event_classes.get(byte2int(data) & 0x7f, event.AnyEvent)
         if type(estruct) == dict:
             # this etype refers to a set of sub-events with individual subcodes
-            estruct = estruct[_to_ord(data[1])]
+            estruct = estruct[indexbytes(data, 1)]
 
         return estruct(display = display, binarydata = data[:32]), data[32:]
 
@@ -887,7 +891,7 @@ def pack_value(self, val):
         return (chr(len(val)) + val).encode()
 
     def parse_binary(self, data, display):
-        slen = _to_ord(data[0]) + 1
+        slen = byte2int(data) + 1
         return data[1:slen].decode(), data[slen:]
 
 Str = StrClass()
@@ -1239,12 +1243,12 @@ def parse_binary_value(self, data, display, length, format):
                 break
 
             # font change
-            if _to_ord(data[0]) == 255:
-                values.append(struct.unpack('>L', data[1:5].decode().encode())[0])
+            if byte2int(data) == 255:
+                values.append(struct.unpack('>L', bytes(data[1:5]))[0])
                 data = data[5:]
 
             # skip null strings
-            elif _to_ord(data[0]) == 0 and _to_ord(data[1]) == 0:
+            elif byte2int(data) == 0 and indexbytes(data, 1) == 0:
                 data = data[2:]
 
             # string with delta
