summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Boswell <mordervomubel+gitlab@lockmail.us>2016-01-31 16:20:41 -0500
committerMatt Boswell <mordervomubel+gitlab@lockmail.us>2016-01-31 16:26:21 -0500
commit4a954c547a5ec7b91d2d9122e284b33822caf634 (patch)
treec7819f054961b434b7ae8d10c49574b9d5e24d3a
parent4fcf7c73da1394e5466ea00898c8c489903fd28c (diff)
fix byte/string bug introduced in 1c46f25e
This is the error message that this commit fixes: TypeError: sequence item 142: expected a bytes-like object, str found Complete what 1c46f25e started, more or less.
-rw-r--r--sshuttle/server.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/sshuttle/server.py b/sshuttle/server.py
index 9ecce93..4ae2749 100644
--- a/sshuttle/server.py
+++ b/sshuttle/server.py
@@ -257,7 +257,7 @@ def main(latency_control):
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))