Fix joining of seed hosts to be compatible with python 3.5

this should also be backwards compatible with python 2

Fix joining of seed hosts to be compatible with python 3.5
this should also be backwards compatible with python 2
d80b590a · shaiay · Brian May · 7f0b5c69 · d80b590a
Commit d80b590a authored Jan 13, 2016 by shaiay Committed by Brian May Jan 17, 2016
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

client.py sshuttle/client.py +1 -1

No files found.
--- 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()