Skip to content

Commit 92b6a43

Browse files
committed
examples: port_publisher python 3 fixes
1 parent a572638 commit 92b6a43

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

examples/port_publisher.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ def handle_serial_read(self):
221221
# escape outgoing data when needed (Telnet IAC (0xff) character)
222222
if self.rfc2217:
223223
data = serial.to_bytes(self.rfc2217.escape(data))
224-
self.buffer_ser2net += data
224+
self.buffer_ser2net.extend(data)
225225
else:
226226
self.handle_serial_error()
227227
except Exception as msg:
@@ -250,13 +250,15 @@ def handle_socket_read(self):
250250
if data:
251251
# Process RFC 2217 stuff when enabled
252252
if self.rfc2217:
253-
data = serial.to_bytes(self.rfc2217.filter(data))
253+
data = b''.join(self.rfc2217.filter(data))
254254
# add data to buffer
255-
self.buffer_net2ser += data
255+
self.buffer_net2ser.extend(data)
256256
else:
257257
# empty read indicates disconnection
258258
self.handle_disconnect()
259259
except socket.error:
260+
if self.log is not None:
261+
self.log.exception("{}: error reading...".format(self.device))
260262
self.handle_socket_error()
261263

262264
def handle_socket_write(self):
@@ -267,6 +269,8 @@ def handle_socket_write(self):
267269
# and remove the sent data from the buffer
268270
self.buffer_ser2net = self.buffer_ser2net[count:]
269271
except socket.error:
272+
if self.log is not None:
273+
self.log.exception("{}: error writing...".format(self.device))
270274
self.handle_socket_error()
271275

272276
def handle_socket_error(self):

0 commit comments

Comments
 (0)