Fix imports to work in python3

Blizzard · Aug 17, 2017 · 342c916 · 342c916
1 parent 0c1dd70
commit 342c916
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 15 deletions.
diff --git a/s2clientprotocol/debug.proto b/s2clientprotocol/debug.proto
@@ -3,7 +3,7 @@ syntax = "proto2";
 
 package SC2APIProtocol;
 
-import "common.proto";
+import "s2clientprotocol/common.proto";
 
 // Issue various useful commands to the game engine.
 message DebugCommand {

diff --git a/s2clientprotocol/query.proto b/s2clientprotocol/query.proto
@@ -3,8 +3,8 @@ syntax = "proto2";
 
 package SC2APIProtocol;
 
-import "common.proto";
-import "error.proto";
+import "s2clientprotocol/common.proto";
+import "s2clientprotocol/error.proto";
 
 message RequestQuery {
   repeated RequestQueryPathing pathing = 1;

diff --git a/s2clientprotocol/raw.proto b/s2clientprotocol/raw.proto
@@ -3,7 +3,7 @@ syntax = "proto2";
 
 package SC2APIProtocol;
 
-import "common.proto";
+import "s2clientprotocol/common.proto";
 
 //
 // Start

diff --git a/s2clientprotocol/sc2api.proto b/s2clientprotocol/sc2api.proto
@@ -3,15 +3,15 @@ syntax = "proto2";
 
 package SC2APIProtocol;
 
-import "common.proto";
-import "data.proto";
-import "debug.proto";
-import "error.proto";
-import "query.proto";
-import "raw.proto";
-import "score.proto";
-import "spatial.proto";
-import "ui.proto";
+import "s2clientprotocol/common.proto";
+import "s2clientprotocol/data.proto";
+import "s2clientprotocol/debug.proto";
+import "s2clientprotocol/error.proto";
+import "s2clientprotocol/query.proto";
+import "s2clientprotocol/raw.proto";
+import "s2clientprotocol/score.proto";
+import "s2clientprotocol/spatial.proto";
+import "s2clientprotocol/ui.proto";
 
 //
 // Notes:

diff --git a/s2clientprotocol/spatial.proto b/s2clientprotocol/spatial.proto
@@ -3,7 +3,7 @@ syntax = "proto2";
 
 package SC2APIProtocol;
 
-import "common.proto";
+import "s2clientprotocol/common.proto";
 
 //
 // Observation - Feature Layer

diff --git a/setup.py b/setup.py
@@ -51,7 +51,7 @@ class BuildPy(build_py):
 
   def run(self):
     for proto_file in proto_files(PROTO_DIR):
-      compile_proto(proto_file, python_out=PROTO_DIR, proto_path=PROTO_DIR)
+      compile_proto(proto_file, python_out=SETUP_DIR, proto_path=SETUP_DIR)
     with open(os.path.join(PROTO_DIR, '__init__.py'), 'a') as f:
       pass
     build_py.run(self)