Skip to content

Commit df944a7

Browse files
committed
protocol: display: Change name of Display attribute "request_length" to
"recv_packet_len" in preparation for more general use.
1 parent 140d716 commit df944a7

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

Xlib/protocol/display.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ def __init__(self, display = None):
8282

8383
# Data used by the send-and-recieve loop
8484
self.sent_requests = []
85-
self.request_length = 0
85+
self.recv_packet_len = 0
8686
self.data_send = ''
8787
self.data_recv = ''
8888
self.data_sent_bytes = 0
@@ -640,8 +640,8 @@ def parse_response(self, request):
640640
gotreq = 0
641641
while 1:
642642
# Are we're waiting for additional data for a request response?
643-
if self.request_length:
644-
if len(self.data_recv) < self.request_length:
643+
if self.recv_packet_len:
644+
if len(self.data_recv) < self.recv_packet_len:
645645
return gotreq
646646
else:
647647
gotreq = self.parse_request_response(request) or gotreq
@@ -664,7 +664,7 @@ def parse_response(self, request):
664664
# Set reply length, and loop around to see if
665665
# we have got the full response
666666
rlen = int(struct.unpack('=L', self.data_recv[4:8])[0])
667-
self.request_length = 32 + rlen * 4
667+
self.recv_packet_len = 32 + rlen * 4
668668

669669
# Else event response
670670
else:
@@ -730,11 +730,11 @@ def parse_request_response(self, request):
730730
raise RuntimeError("Expected reply for request %s, but got %s. Can't happen!"
731731
% (req._serial, sno))
732732

733-
req._parse_response(self.data_recv[:self.request_length])
733+
req._parse_response(self.data_recv[:self.recv_packet_len])
734734
# print 'recv Request:', req
735735

736-
self.data_recv = buffer(self.data_recv, self.request_length)
737-
self.request_length = 0
736+
self.data_recv = buffer(self.data_recv, self.recv_packet_len)
737+
self.recv_packet_len = 0
738738

739739

740740
# Unlock any response waiting threads

0 commit comments

Comments
 (0)