From 0fd2f30911f9419aa700b1822cc7754e71ee8f43 Mon Sep 17 00:00:00 2001
From: clowwindy <clowwindy42@gmail.com>
Date: Fri, 31 Oct 2014 18:43:15 +0800
Subject: [PATCH] lint code

---
 shadowsocks/common.py             | 2 +-
 shadowsocks/crypto/salsa20_ctr.py | 2 +-
 shadowsocks/encrypt.py            | 2 +-
 shadowsocks/server.py             | 3 ++-
 shadowsocks/tcprelay.py           | 3 ++-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/shadowsocks/common.py b/shadowsocks/common.py
index cba287e..d585065 100644
--- a/shadowsocks/common.py
+++ b/shadowsocks/common.py
@@ -52,7 +52,7 @@ def inet_ntop(family, ipstr):
         return socket.inet_ntoa(ipstr)
     elif family == socket.AF_INET6:
         v6addr = b':'.join((b'%02X%02X' % (ord(i), ord(j)))
-                          for i, j in zip(ipstr[::2], ipstr[1::2]))
+                           for i, j in zip(ipstr[::2], ipstr[1::2]))
         return v6addr
 
 
diff --git a/shadowsocks/crypto/salsa20_ctr.py b/shadowsocks/crypto/salsa20_ctr.py
index d1910ea..0f5bfb8 100644
--- a/shadowsocks/crypto/salsa20_ctr.py
+++ b/shadowsocks/crypto/salsa20_ctr.py
@@ -72,7 +72,7 @@ def numpy_xor(a, b):
 
 def py_xor_str(a, b):
     c = []
-    for i in xrange(0, len(a)):
+    for i in range(0, len(a)):
         c.append(chr(ord(a[i]) ^ ord(b[i])))
     return ''.join(c)
 
diff --git a/shadowsocks/encrypt.py b/shadowsocks/encrypt.py
index 974785c..4997a6e 100644
--- a/shadowsocks/encrypt.py
+++ b/shadowsocks/encrypt.py
@@ -61,7 +61,7 @@ def get_table(key):
     s = m.digest()
     (a, b) = struct.unpack('<QQ', s)
     table = [c for c in string.maketrans('', '')]
-    for i in xrange(1, 1024):
+    for i in range(1, 1024):
         table.sort(lambda x, y: int(a % (ord(x) + i) - a % (ord(y) + i)))
     return table
 
diff --git a/shadowsocks/server.py b/shadowsocks/server.py
index 0c4c489..2ee74bd 100755
--- a/shadowsocks/server.py
+++ b/shadowsocks/server.py
@@ -70,7 +70,8 @@ def main():
     def run_server():
         def child_handler(signum, _):
             logging.warn('received SIGQUIT, doing graceful shutting down..')
-            list(map(lambda s: s.close(next_tick=True), tcp_servers + udp_servers))
+            list(map(lambda s: s.close(next_tick=True),
+                     tcp_servers + udp_servers))
         signal.signal(getattr(signal, 'SIGQUIT', signal.SIGTERM),
                       child_handler)
         try:
diff --git a/shadowsocks/tcprelay.py b/shadowsocks/tcprelay.py
index 4145c84..724c1ed 100644
--- a/shadowsocks/tcprelay.py
+++ b/shadowsocks/tcprelay.py
@@ -268,7 +268,8 @@ class TCPRelayHandler(object):
             self._stage = STAGE_DNS
             if self._is_local:
                 # forward address to remote
-                self._write_to_sock(b'\x05\x00\x00\x01\x00\x00\x00\x00\x10\x10',
+                self._write_to_sock((b'\x05\x00\x00\x01'
+                                     b'\x00\x00\x00\x00\x10\x10'),
                                     self._local_sock)
                 data_to_send = self._encryptor.encrypt(data)
                 self._data_to_write_to_remote.append(data_to_send)