Skip to content

Commit 2ee8143

Browse files
Tests from test_events_le.py was fixed for Py3
1 parent 8a958a8 commit 2ee8143

3 files changed

Lines changed: 21 additions & 9 deletions

File tree

‎Xlib/protocol/rq.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -530,7 +530,7 @@ def pack_value(self, val):
530530
if self.type.check_value is not None:
531531
val = [self.type.check_value(v) for v in val]
532532
data = array(struct_to_array_codes[self.type.structcode],
533-
val).tostring()
533+
val).tobytes()
534534
else:
535535
data = []
536536
for v in val:
@@ -627,7 +627,7 @@ def parse_binary_value(self, data, display, length, format):
627627
ret = None
628628

629629
elif format == 8:
630-
ret = (8, str(data[:length]))
630+
ret = (8, data[:length].decode())
631631
data = data[length + ((4 - length % 4) % 4):]
632632

633633
elif format == 16:
@@ -662,7 +662,7 @@ def pack_value(self, value):
662662
val = list(val)
663663

664664
size = fmt // 8
665-
data = array(array_unsigned_codes[size], val).tostring()
665+
data = array(array_unsigned_codes[size], val).tobytes()
666666
dlen = len(val)
667667

668668
dl = len(data)
@@ -783,7 +783,7 @@ def pack_value(self, value):
783783
for i in range(len(v), keycodes):
784784
a.append(X.NoSymbol)
785785

786-
return a.tostring(), len(value), keycodes
786+
return a.tobytes(), len(value), keycodes
787787

788788

789789
class ModifierMapping(ValueField):
@@ -814,7 +814,7 @@ def pack_value(self, value):
814814
for i in range(len(v), keycodes):
815815
a.append(0)
816816

817-
return a.tostring(), len(value), keycodes
817+
return a.tobytes(), len(value), keycodes
818818

819819
class EventField(ValueField):
820820
structcode = None

‎test/test_events_be.py‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,14 @@ def __getitem__(self, key):
2828
def __getattr__(self, attr):
2929
return getattr(self.array, attr)
3030

31-
def __cmp__(self, other):
32-
return cmp(self.array.tolist(), other)
31+
def __lt__(self, other):
32+
return self.array.tolist() < other
33+
34+
def __gt__(self, other):
35+
return self.array.tolist() > other
36+
37+
def __eq__(self, other):
38+
return self.array.tolist() == other
3339

3440
rq.array = CmpArray
3541

‎test/test_events_le.py‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,14 @@ def __getitem__(self, key):
3737
def __getattr__(self, attr):
3838
return getattr(self.array, attr)
3939

40-
def __cmp__(self, other):
41-
return cmp(self.array.tolist(), other)
40+
def __lt__(self, other):
41+
return self.array.tolist() < other
42+
43+
def __gt__(self, other):
44+
return self.array.tolist() > other
45+
46+
def __eq__(self, other):
47+
return self.array.tolist() == other
4248

4349
rq.array = CmpArray
4450

0 commit comments

Comments
 (0)