From ac1883eb7fe622c7ccd759d557e739e9534151e7 Mon Sep 17 00:00:00 2001 From: Falseen Date: Fri, 17 Feb 2017 17:25:30 +0800 Subject: [PATCH] update pep8 for travis --- shadowsocks/local.py | 6 +++--- shadowsocks/tunnel.py | 6 +++--- shadowsocks/udprelay.py | 13 +++++++------ 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/shadowsocks/local.py b/shadowsocks/local.py index 7138046..95011d7 100755 --- a/shadowsocks/local.py +++ b/shadowsocks/local.py @@ -54,9 +54,9 @@ def main(): # if both_tunnel_local is True then run tunnel_udp_server if config["both_tunnel_local"]: config["local_port"] = config.copy()["tunnel_port"] - logging.info("starting tunnel at %s:%d forward to %s:%d" % \ - (config['local_address'], config['local_port'], config['tunnel_remote'], \ - config['tunnel_remote_port'])) + logging.info("starting tunnel at %s:%d forward to %s:%d" % + (config['local_address'], config['local_port'], config['tunnel_remote'], + config['tunnel_remote_port'])) tunnel_udp_server = udprelay.UDPRelay(config, dns_resolver, True) tunnel_udp_server.is_tunnel = True tunnel_udp_server.add_to_loop(loop) diff --git a/shadowsocks/tunnel.py b/shadowsocks/tunnel.py index a073213..46c3827 100644 --- a/shadowsocks/tunnel.py +++ b/shadowsocks/tunnel.py @@ -44,9 +44,9 @@ def main(): dns_resolver.add_to_loop(loop) # tcp_server.add_to_loop(loop) config["local_port"] = config.copy()["tunnel_port"] - logging.info("starting tunnel at %s:%d forward to %s:%d" % \ - (config['local_address'], config['local_port'], config['tunnel_remote'], \ - config['tunnel_remote_port'])) + logging.info("starting tunnel at %s:%d forward to %s:%d" % + (config['local_address'], config['local_port'], config['tunnel_remote'], + config['tunnel_remote_port'])) tunnel_udp_server = udprelay.UDPRelay(config, dns_resolver, True) tunnel_udp_server.is_tunnel = True tunnel_udp_server.add_to_loop(loop) diff --git a/shadowsocks/udprelay.py b/shadowsocks/udprelay.py index 2d85451..169fc0b 100644 --- a/shadowsocks/udprelay.py +++ b/shadowsocks/udprelay.py @@ -82,6 +82,7 @@ def client_key(source_addr, server_af): class UDPRelay(object): + def __init__(self, config, dns_resolver, is_local, stat_callback=None): self._config = config if is_local: @@ -160,8 +161,8 @@ class UDPRelay(object): # add socks5 header to data tunnel_remote = self.tunnel_remote tunnel_remote_port = self.tunnel_remote_port - data = common.add_header(tunnel_remote, \ - tunnel_remote_port, data) + data = common.add_header(tunnel_remote, + tunnel_remote_port, data) else: frag = common.ord(data[2]) if frag != 0: @@ -183,8 +184,8 @@ class UDPRelay(object): if header_result is None: return addrtype, dest_addr, dest_port, header_length = header_result - logging.info("udp data to %s:%d from %s:%d" \ - %(dest_addr, dest_port, r_addr[0], r_addr[1])) + logging.info("udp data to %s:%d from %s:%d" + % (dest_addr, dest_port, r_addr[0], r_addr[1])) if self._is_local: server_addr, server_port = self._get_a_server() else: @@ -287,8 +288,8 @@ class UDPRelay(object): response = b'\x00\x00\x00' + data client_addr = self._client_fd_to_server_addr.get(sock.fileno()) if client_addr: - logging.debug("send udp response to %s:%d" \ - %(client_addr[0], client_addr[1])) + logging.debug("send udp response to %s:%d" + % (client_addr[0], client_addr[1])) self._server_socket.sendto(response, client_addr) else: # this packet is from somewhere else we know