Browse Source

compatible python3

dev
BreakWa11 8 years ago
parent
commit
acb3eb2910
  1. 4
      server_pool.py
  2. 1
      shadowsocks/encrypt.py

4
server_pool.py

@ -123,6 +123,7 @@ class ServerPool(object):
a_config['server'] = a_config['server_ipv6']
a_config['server_port'] = port
a_config['max_connect'] = 128
a_config['method'] = common.to_str(a_config['method'])
try:
logging.info("starting server at [%s]:%d" % (common.to_str(a_config['server']), port))
@ -148,8 +149,9 @@ class ServerPool(object):
a_config.update(user_config)
a_config['server_port'] = port
a_config['max_connect'] = 128
a_config['method'] = common.to_str(a_config['method'])
try:
logging.info("starting server at %s:%d" % (a_config['server'], port))
logging.info("starting server at %s:%d" % (common.to_str(a_config['server']), port))
tcp_server = tcprelay.TCPRelay(a_config, self.dns_resolver, False)
tcp_server.add_to_loop(self.loop)

1
shadowsocks/encrypt.py

@ -75,7 +75,6 @@ def EVP_BytesToKey(password, key_len, iv_len):
class Encryptor(object):
def __init__(self, key, method):
self.key = key
method = common.to_str(method)
self.method = method
self.iv = None
self.iv_sent = False

Loading…
Cancel
Save