From f7f763f2b467110f3fbe8bc881ca1b26ea187690 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwe@kingsome.cn>
Date: Thu, 10 Jan 2019 22:00:14 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4python=E4=BE=9D=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/tools/scripts/construct/build_pb.py | 18 +++++++++---------
 server/wsproxy/CMakeLists.txt              |  2 --
 third_party/a8engine                       |  2 +-
 third_party/framework                      |  2 +-
 4 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/server/tools/scripts/construct/build_pb.py b/server/tools/scripts/construct/build_pb.py
index 0c50606..00252dd 100644
--- a/server/tools/scripts/construct/build_pb.py
+++ b/server/tools/scripts/construct/build_pb.py
@@ -16,18 +16,18 @@ def printp_stdout(p):
         while not is_terminated():
             line = p.stdout.readline()
             if len(line) > 0:
-                print line,
-    except Exception, e:
-        print 'build_pb stdout error:' + e
+                print(line, end = '')
+    except Exception as e:
+        print('build_pb stdout error:' + e)
 
 def printp_stderr(p):
     try:
         while is_terminated():
             line = p.stderr.readline()
             if len(line) > 0:
-                print line,
-    except Exception, e:
-        print 'build_pb stderr error:' + e
+                print(line, end = '')
+    except Exception as e:
+        print('build_pb stderr error:' + e)
 
 def need_rebuild():
     for proto_name in ('ss_proto', 'ss_msgid'):
@@ -58,8 +58,8 @@ def rebuild():
         t1.join()
         t2.join()
         sys.exit(p.returncode)
-    except Exception, e:
-        print 'build_protocol rebuild error:' + str(e)
+    except Exception as e:
+        print('build_protocol rebuild error:' + str(e))
 
 def repair_githooks():
     os.system('/bin/bash ../tools/scripts/githooks/install.sh')
@@ -68,4 +68,4 @@ repair_githooks()
 if need_rebuild():
     rebuild()
 else:
-    print 'pb files already is the latest'
+    print('pb files already is the latest')
diff --git a/server/wsproxy/CMakeLists.txt b/server/wsproxy/CMakeLists.txt
index 6ae4022..910da79 100644
--- a/server/wsproxy/CMakeLists.txt
+++ b/server/wsproxy/CMakeLists.txt
@@ -10,7 +10,6 @@ include_directories(
   ../../third_party/a8engine
   /usr/include/mysql
   /usr/include/jsoncpp
-  /usr/include/python3.4m
   /usr/include/hiredis
   ../../third_party
   .
@@ -61,7 +60,6 @@ target_link_libraries(
   rt
   crypto
   ssl
-  python3.4m
   jsoncpp
   curl
   hiredis
diff --git a/third_party/a8engine b/third_party/a8engine
index 0c3e904..972852f 160000
--- a/third_party/a8engine
+++ b/third_party/a8engine
@@ -1 +1 @@
-Subproject commit 0c3e904eec417052ee2fdacc90751feeaa3bc5a2
+Subproject commit 972852f335e1245614b2349a780de93b4d1d7bcb
diff --git a/third_party/framework b/third_party/framework
index 6313ff5..803b181 160000
--- a/third_party/framework
+++ b/third_party/framework
@@ -1 +1 @@
-Subproject commit 6313ff569fbc5454c4c1590c322a73c7721ef777
+Subproject commit 803b1812d08fe8c3b3eea9371f8d9b0bead93c6d