Merge "add missing str to bytes conversion for Python3"
This commit is contained in:
commit
8d3ea4bcff
|
@ -3273,7 +3273,7 @@ class Server(BaseClientServer):
|
||||||
for connection in self.active_connections:
|
for connection in self.active_connections:
|
||||||
fd = connection.conn.fileno()
|
fd = connection.conn.fileno()
|
||||||
ip = connection.host
|
ip = connection.host
|
||||||
client_id = connection.client_id or '-'
|
client_id = connection.client_id or b'-'
|
||||||
functions = b' '.join(connection.functions).decode('utf8')
|
functions = b' '.join(connection.functions).decode('utf8')
|
||||||
request.connection.sendRaw(("%s %s %s : %s\n" %
|
request.connection.sendRaw(("%s %s %s : %s\n" %
|
||||||
(fd, ip, client_id.decode('utf8'),
|
(fd, ip, client_id.decode('utf8'),
|
||||||
|
|
Loading…
Reference in New Issue