diff options
author | Chris Liechti <cliechti@gmx.net> | 2017-08-25 21:13:37 +0200 |
---|---|---|
committer | Chris Liechti <cliechti@gmx.net> | 2017-08-25 21:13:37 +0200 |
commit | 92b6a43548432da927923fb8d4d9e8269ba43799 (patch) | |
tree | 2ee8c73ba23dd045cb1a38f0244f0b4390fd186d /examples | |
parent | a57263837adcdb8e47f3b082801838a945a4a60f (diff) | |
download | pyserial-git-92b6a43548432da927923fb8d4d9e8269ba43799.tar.gz |
examples: port_publisher python 3 fixes
Diffstat (limited to 'examples')
-rwxr-xr-x | examples/port_publisher.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/examples/port_publisher.py b/examples/port_publisher.py index f617875..eecc2a1 100755 --- a/examples/port_publisher.py +++ b/examples/port_publisher.py @@ -221,7 +221,7 @@ class Forwarder(ZeroconfService): # escape outgoing data when needed (Telnet IAC (0xff) character) if self.rfc2217: data = serial.to_bytes(self.rfc2217.escape(data)) - self.buffer_ser2net += data + self.buffer_ser2net.extend(data) else: self.handle_serial_error() except Exception as msg: @@ -250,13 +250,15 @@ class Forwarder(ZeroconfService): if data: # Process RFC 2217 stuff when enabled if self.rfc2217: - data = serial.to_bytes(self.rfc2217.filter(data)) + data = b''.join(self.rfc2217.filter(data)) # add data to buffer - self.buffer_net2ser += data + self.buffer_net2ser.extend(data) else: # empty read indicates disconnection self.handle_disconnect() except socket.error: + if self.log is not None: + self.log.exception("{}: error reading...".format(self.device)) self.handle_socket_error() def handle_socket_write(self): @@ -267,6 +269,8 @@ class Forwarder(ZeroconfService): # and remove the sent data from the buffer self.buffer_ser2net = self.buffer_ser2net[count:] except socket.error: + if self.log is not None: + self.log.exception("{}: error writing...".format(self.device)) self.handle_socket_error() def handle_socket_error(self): |