Skip to content

Commit

Permalink
more pylint warning fixes
Browse files Browse the repository at this point in the history
git-svn-id: https://xpra.org/svn/Xpra/trunk@21711 3bb7dfac-3a0b-4e04-842a-767bc560f471
  • Loading branch information
totaam committed Feb 19, 2019
1 parent a76d73c commit 459d3b3
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 5 deletions.
12 changes: 8 additions & 4 deletions src/xpra/net/protocol.py
Original file line number Diff line number Diff line change
Expand Up @@ -413,7 +413,8 @@ def _add_chunks_to_queue(self, packet_type, chunks, start_send_cb=None, end_send
assert len(padded)==actual_size, "expected padded size to be %i, but got %i" % (len(padded), actual_size)
data = self.cipher_out.encrypt(padded)
assert len(data)==actual_size, "expected encrypted size to be %i, but got %i" % (len(data), actual_size)
cryptolog("sending %s bytes %s encrypted with %s padding", payload_size, self.cipher_out_name, padding_size)
cryptolog("sending %s bytes %s encrypted with %s padding",
payload_size, self.cipher_out_name, padding_size)
if proto_flags & FLAGS_NOHEADER:
assert not self.cipher_out
#for plain/text packets (ie: gibberish response)
Expand Down Expand Up @@ -873,7 +874,8 @@ def do_read_parse_thread_loop(self):
def check_packet_size(size_to_check, packet_header):
if self._closed:
return False
log("check_packet_size(%#x, %s) max=%#x", size_to_check, hexstr(packet_header), self.max_packet_size)
log("check_packet_size(%#x, %s) max=%#x",
size_to_check, hexstr(packet_header), self.max_packet_size)
if size_to_check>self.max_packet_size:
msg = "packet size requested is %s but maximum allowed is %s" % \
(size_to_check, self.max_packet_size)
Expand Down Expand Up @@ -912,7 +914,8 @@ def check_packet_size(size_to_check, packet_header):
if not (protocol_flags & FLAGS_CIPHER):
self.invalid("unencrypted packet dropped", data)
return
cryptolog("received %i %s encrypted bytes with %i padding", payload_size, self.cipher_in_name, padding_size)
cryptolog("received %i %s encrypted bytes with %i padding",
payload_size, self.cipher_in_name, padding_size)
data = self.cipher_in.decrypt(data)
if padding_size > 0:
def debug_str(s):
Expand Down Expand Up @@ -1056,7 +1059,8 @@ def close_and_release():
pass
done()
def wait_for_packet_sent():
log("flush_then_close: wait_for_packet_sent() queue.empty()=%s, closed=%s", self._write_queue.empty(), self._closed)
log("flush_then_close: wait_for_packet_sent() queue.empty()=%s, closed=%s",
self._write_queue.empty(), self._closed)
if self._write_queue.empty() or self._closed:
#it got sent, we're done!
close_and_release()
Expand Down
3 changes: 2 additions & 1 deletion src/xpra/net/websockets/protocol.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,8 @@ def parse_remote_caps(self, caps):
if LEGACY_FRAME_PER_CHUNK is None:
may_have_bug = caps.strget("client_type", "")=="HTML5"
self.legacy_frame_per_chunk = not caps.boolget("websocket.multi-packet", not may_have_bug)
log("parse_remote_caps() may_have_bug=%s, legacy_frame_per_chunk=%s", may_have_bug, self.legacy_frame_per_chunk)
log("parse_remote_caps() may_have_bug=%s, legacy_frame_per_chunk=%s",
may_have_bug, self.legacy_frame_per_chunk)
if self.legacy_frame_per_chunk:
log.warn("Warning: using slower legacy websocket frames")
log.warn(" the other end is probably out of date")
Expand Down

0 comments on commit 459d3b3

Please sign in to comment.