summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorshaiay <shaiay@gmail.com>2016-01-13 23:30:49 +0200
committerBrian May <brian@linuxpenguins.xyz>2016-01-17 12:05:23 +1100
commitd80b590a71c48933969fe04190e748067561c8c3 (patch)
treed8bff42d41253ce7747496e0ec06e88821a6a449
parent7f0b5c698b6336f91c9587f2dc10e2439d0f73bd (diff)
Fix joining of seed hosts to be compatible with python 3.5
this should also be backwards compatible with python 2
-rw-r--r--sshuttle/client.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/sshuttle/client.py b/sshuttle/client.py
index 7a7b6d7..bc07d6e 100644
--- a/sshuttle/client.py
+++ b/sshuttle/client.py
@@ -487,7 +487,7 @@ def _main(tcp_listener, udp_listener, fw, ssh_cmd, remotename,
if seed_hosts is not None:
debug1('seed_hosts: %r\n' % seed_hosts)
- mux.send(0, ssnet.CMD_HOST_REQ, b'\n'.join(seed_hosts))
+ mux.send(0, ssnet.CMD_HOST_REQ, str.encode('\n'.join(seed_hosts)))
while 1:
rv = serverproc.poll()