From 1951a0660c35510b07f352b5fb3f6f86b383f4a4 Mon Sep 17 00:00:00 2001 From: Falseen Date: Fri, 17 Feb 2017 03:32:39 +0800 Subject: [PATCH] fix pep8 for travis --- shadowsocks/shell.py | 6 ++++-- shadowsocks/tunnel.py | 2 +- shadowsocks/udprelay.py | 7 ++++--- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/shadowsocks/shell.py b/shadowsocks/shell.py index 34d0e18..4830fb9 100644 --- a/shadowsocks/shell.py +++ b/shadowsocks/shell.py @@ -160,7 +160,8 @@ def check_config(config, is_local): config['server_port'] = int(config['server_port']) if 'tunnel_dns_server_port' in config: - config['tunnel_dns_server_port'] = int(config['tunnel_dns_server_port']) + config['tunnel_dns_server_port'] = \ + int(config['tunnel_dns_server_port']) if 'tunnel_dns_local_port' in config: config['tunnel_dns_local_port'] = int(config['tunnel_dns_local_port']) @@ -303,7 +304,8 @@ def get_config(is_local): config['prefer_ipv6'] = config.get('prefer_ipv6', False) config['server_port'] = config.get('server_port', 8388) config['tunnel_service'] = config.get('tunnel_service', False) - config['tunnel_dns_server'] = to_str(config.get('tunnel_dns_server', "8.8.8.8")) + config['tunnel_dns_server'] = \ + to_str(config.get('tunnel_dns_server', "8.8.8.8")) config['tunnel_dns_server_port'] = config.get('tunnel_dns_server_port', 53) config['tunnel_dns_local_port'] = config.get('tunnel_dns_local_port', 53) diff --git a/shadowsocks/tunnel.py b/shadowsocks/tunnel.py index c62b4c5..8c9e7a4 100644 --- a/shadowsocks/tunnel.py +++ b/shadowsocks/tunnel.py @@ -30,7 +30,7 @@ from shadowsocks import shell, daemon, eventloop, udprelay, asyncdns def get_tunnel_udp_server(config, dns_resolver): if config["tunnel_service"]: config["local_port"] = config.copy()["tunnel_dns_local_port"] - logging.info("starting tunnel at %s:%d" % + logging.info("starting tunnel at %s:%d" % \ (config['local_address'], config['local_port'])) else: logging.info("tunnel_service is False") diff --git a/shadowsocks/udprelay.py b/shadowsocks/udprelay.py index 1822f1c..a1f1eea 100644 --- a/shadowsocks/udprelay.py +++ b/shadowsocks/udprelay.py @@ -160,7 +160,8 @@ class UDPRelay(object): # add socks5 header to data tunnel_dns_server = self.tunnel_dns_server tunnel_dns_server_port = self.tunnel_dns_server_port - data = common.add_header(tunnel_dns_server, tunnel_dns_server_port, data) + data = common.add_header(tunnel_dns_server, \ + tunnel_dns_server_port, data) else: frag = common.ord(data[2]) if frag != 0: @@ -182,7 +183,7 @@ 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" + 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() @@ -286,7 +287,7 @@ 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" + logging.debug("send udp response to %s:%d" \ %(client_addr[0], client_addr[1])) self._server_socket.sendto(response, client_addr) else: