From 6f8fc5b77f39e2567667bb9ff6340fd11166f55c Mon Sep 17 00:00:00 2001
From: breakwa11 <mmgac001@gmail.com>
Date: Fri, 25 Sep 2015 22:17:34 +0800
Subject: [PATCH] remove thread module

---
 server.py             | 12 ++++++++++--
 server_pool.py        | 12 ++++++++++--
 shadowsocks/server.py |  2 +-
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/server.py b/server.py
index de03e47..585380f 100644
--- a/server.py
+++ b/server.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 import time
 import sys
-import thread
+import threading
 import os
 os.chdir(os.path.split(os.path.realpath(__file__))[0])
 
@@ -12,9 +12,17 @@ import db_transfer
 #	 thread.start_new_thread(DbTransfer.thread_db, ())
 #	 Api.web_server()
 
+class MainThread(threading.Thread):
+	def __init__(self):
+		threading.Thread.__init__(self)
+
+	def run(self):
+		db_transfer.DbTransfer.thread_db()
+
 if __name__ == '__main__':
 	#server_pool.ServerPool.get_instance()
 	#server_pool.ServerPool.get_instance().new_server(2333, '2333')
-	thread.start_new_thread(db_transfer.DbTransfer.thread_db, ())
+	thread = MainThread()
+	thread.start()
 	while True:
 		time.sleep(99999)
diff --git a/server_pool.py b/server_pool.py
index 90101bd..77d300d 100644
--- a/server_pool.py
+++ b/server_pool.py
@@ -29,13 +29,20 @@ from shadowsocks import eventloop
 from shadowsocks import tcprelay
 from shadowsocks import udprelay
 from shadowsocks import asyncdns
-import thread
 import threading
 import sys
 import asyncmgr
 import Config
 from socket import *
 
+class MainThread(threading.Thread):
+	def __init__(self, params):
+		threading.Thread.__init__(self)
+		self.params = params
+
+	def run(self):
+		ServerPool._loop(*self.params)
+
 class ServerPool(object):
 
 	instance = None
@@ -53,7 +60,8 @@ class ServerPool(object):
 		self.udp_ipv6_servers_pool = {}
 
 		self.loop = eventloop.EventLoop()
-		thread.start_new_thread(ServerPool._loop, (self.loop, self.dns_resolver, self.mgr))
+		thread = MainThread( (self.loop, self.dns_resolver, self.mgr) )
+		thread.start()
 
 	@staticmethod
 	def get_instance():
diff --git a/shadowsocks/server.py b/shadowsocks/server.py
index 68a6716..e61d6c2 100755
--- a/shadowsocks/server.py
+++ b/shadowsocks/server.py
@@ -74,7 +74,7 @@ def main():
                              (a_config['server'], int(port)))
                 tcp_servers.append(tcprelay.TCPRelay(a_config, dns_resolver, False))
                 udp_servers.append(udprelay.UDPRelay(a_config, dns_resolver, False))
-                if a_config['server_ipv6'] == "::":
+                if a_config['server_ipv6'] == b"::":
                     ipv6_ok = True
             except Exception as e:
                 shell.print_exception(e)