Skip to content

Commit

Permalink
fix pylint warnings
Browse files Browse the repository at this point in the history
git-svn-id: https://xpra.org/svn/Xpra/trunk@21681 3bb7dfac-3a0b-4e04-842a-767bc560f471
  • Loading branch information
totaam committed Feb 18, 2019
1 parent 2a633ce commit 811efcb
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions src/xpra/server/rfb/rfb_protocol.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@
import struct
from socket import error as socket_error

from xpra.log import Logger
log = Logger("network", "protocol", "rfb")

from xpra.os_util import Queue, hexstr, strtobytes
from xpra.util import repr_ellipsized, envint, nonl
from xpra.make_thread import make_thread, start_thread
from xpra.net.protocol import force_flush_queue, exit_queue
from xpra.net.common import ConnectionClosedException #@UndefinedVariable (pydev false positive)
from xpra.net.bytestreams import ABORT
from xpra.server.rfb.rfb_const import RFBClientMessage, RFBAuth, PIXEL_FORMAT
from xpra.log import Logger

log = Logger("network", "protocol", "rfb")

READ_BUFFER_SIZE = envint("XPRA_READ_BUFFER_SIZE", 65536)

Expand Down Expand Up @@ -153,7 +153,7 @@ def _parse_security_result(self, packet):
def _parse_rfb(self, packet):
try:
ptype = ord(packet[0])
except:
except TypeError:
ptype = packet[0]
packet_type = RFBClientMessage.PACKET_TYPE_STR.get(ptype)
if not packet_type:
Expand Down Expand Up @@ -360,8 +360,8 @@ def close(self):
try:
log("RFBProtocol.close() calling %s", c.close)
c.close()
except:
log.error("error closing %s", self._conn, exc_info=True)
except IOError:
log.error("Error closing %s", self._conn, exc_info=True)
self._conn = None
self.terminate_queue_threads()
self._process_packet_cb(self, [RFBProtocol.CONNECTION_LOST])
Expand Down

0 comments on commit 811efcb

Please sign in to comment.