Skip to content

Commit

Permalink
fix byte/string bug introduced in 1c46f25
Browse files Browse the repository at this point in the history
This is the error message that this commit fixes:
TypeError: sequence item 142: expected a bytes-like object, str found

Complete what 1c46f25 started, more or less.
  • Loading branch information
Matt Boswell committed Jan 31, 2016
1 parent 4fcf7c7 commit 4a954c5
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion sshuttle/server.py
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ def hostwatch_ready(sock):
if lines[-1]:
# no terminating newline: entry isn't complete yet!
hw.leftover = lines.pop()
lines.append('')
lines.append(b'')
else:
hw.leftover = b''
mux.send(0, ssnet.CMD_HOST_LIST, b'\n'.join(lines))
Expand Down

0 comments on commit 4a954c5

Please sign in to comment.