Fix joining of seed hosts to be compatible with python 3.5

this should also be backwards compatible with python 2
This commit is contained in:
shaiay 2016-01-13 23:30:49 +02:00 committed by Brian May
parent 7f0b5c698b
commit d80b590a71

View File

@ -487,7 +487,7 @@ def _main(tcp_listener, udp_listener, fw, ssh_cmd, remotename,
if seed_hosts is not None: if seed_hosts is not None:
debug1('seed_hosts: %r\n' % seed_hosts) 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: while 1:
rv = serverproc.poll() rv = serverproc.poll()