From f43906006a08712316a07392405fa70929e8e32d Mon Sep 17 00:00:00 2001 From: Bin Wang Date: Mon, 10 Nov 2014 10:37:37 +0800 Subject: [PATCH] fix str/byte issue in python 3 --- shadowsocks/tcprelay.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shadowsocks/tcprelay.py b/shadowsocks/tcprelay.py index 39e88fe..e25c63f 100644 --- a/shadowsocks/tcprelay.py +++ b/shadowsocks/tcprelay.py @@ -407,7 +407,7 @@ class TCPRelayHandler(object): def _on_local_write(self): if self._data_to_write_to_local: - data = ''.join(self._data_to_write_to_local) + data = b''.join(self._data_to_write_to_local) self._data_to_write_to_local = [] self._write_to_sock(data, self._local_sock) else: