Add support for spec compatible URLs in server generated code and upd…

…ate to protoc 3.12.4.
twitchtv · Aug 24, 2020 · 21ccd0c · 21ccd0c
1 parent 987a500
commit 21ccd0c
Show file tree

Hide file tree

Showing 27 changed files with 281 additions and 111 deletions.
diff --git a/clientcompat/pycompat/clientcompat_pb2.py b/clientcompat/pycompat/clientcompat_pb2.py
diff --git a/clientcompat/pycompat/pycompat.py b/clientcompat/pycompat/pycompat.py
@@ -25,14 +25,14 @@ def main():
     client = clientcompat_pb2_twirp.CompatServiceClient(req.service_address)
     try:
         resp = do_request(client, req)
-        sys.stdout.write(resp.SerializeToString())
+        sys.stdout.write(resp.SerializeToString().decode(encoding="utf-8"))
     except clientcompat_pb2_twirp.TwirpException as e:
         sys.stderr.write(e.code)
 
 
 def read_request():
     input_str = sys.stdin.read()
-    return clientcompat_pb2.ClientCompatMessage.FromString(input_str)
+    return clientcompat_pb2.ClientCompatMessage.FromString(input_str.encode(encoding="utf-8"))
 
 
 def do_request(client, req):

diff --git a/example/service_pb2.py b/example/service_pb2.py
diff --git a/install_proto.bash b/install_proto.bash
@@ -18,10 +18,10 @@ PROTOC_EXISTS=$?
 if [ $PROTOC_EXISTS -eq 0 ]; then
     echo "Protoc already installed"
 	PROTOC_VERSION=`protoc --version`
-	if [ "$PROTOC_VERSION" == "libprotoc 3.11.0" ]; then
+	if [ "$PROTOC_VERSION" == "libprotoc 3.12.4" ]; then
 		exit 0
 	fi
-	echo "libprotoc 3.11.0 required, but found: $PROTOC_VERSION"
+	echo "libprotoc 3.12.4 required, but found: $PROTOC_VERSION"
 	exit 1
 fi
 
@@ -30,8 +30,8 @@ if [ "$(uname)" == "Darwin" ]; then
 elif [ `whoami` == "root" ]; then
     mkdir -p /usr/local/src/protoc
     pushd /usr/local/src/protoc
-    wget https://github.com/google/protobuf/releases/download/v3.11.0/protoc-3.11.0-linux-x86_64.zip -O /usr/local/src/protoc-3.11.0-linux-x86_64.zip
-    unzip -x ../protoc-3.11.0-linux-x86_64.zip
+    wget https://github.com/google/protobuf/releases/download/v3.12.4/protoc-3.12.4-linux-x86_64.zip -O /usr/local/src/protoc-3.12.4-linux-x86_64.zip
+    unzip -x ../protoc-3.12.4-linux-x86_64.zip
     if [ ! -e /usr/local/bin/protoc ]; then
         ln -s `pwd`/bin/protoc /usr/local/bin/protoc
     fi
@@ -41,8 +41,8 @@ elif [ "$(expr substr $(uname -s) 1 5)" == "Linux" ]; then
     sudo chmod a+w /usr/local/src
     mkdir -p /usr/local/src/protoc
     pushd /usr/local/src/protoc
-    wget https://github.com/google/protobuf/releases/download/v3.11.0/protoc-3.11.0-linux-x86_64.zip -O /usr/local/src/protoc-3.11.0-linux-x86_64.zip
-    unzip -x ../protoc-3.11.0-linux-x86_64.zip
+    wget https://github.com/google/protobuf/releases/download/v3.12.4/protoc-3.12.4-linux-x86_64.zip -O /usr/local/src/protoc-3.12.4-linux-x86_64.zip
+    unzip -x ../protoc-3.12.4-linux-x86_64.zip
     if [ ! -e /usr/local/bin/protoc ]; then
         sudo ln -s `pwd`/bin/protoc /usr/local/bin/protoc
     fi

diff --git a/internal/twirptest/empty_service/empty_service_pb2.py b/internal/twirptest/empty_service/empty_service_pb2.py
diff --git a/internal/twirptest/google_protobuf_imports/service_pb2.py b/internal/twirptest/google_protobuf_imports/service_pb2.py
diff --git a/internal/twirptest/importable/importable_pb2.py b/internal/twirptest/importable/importable_pb2.py
diff --git a/internal/twirptest/importer/importer_pb2.py b/internal/twirptest/importer/importer_pb2.py
diff --git a/internal/twirptest/importer_local/importer_local_msgdef_pb2.py b/internal/twirptest/importer_local/importer_local_msgdef_pb2.py
diff --git a/internal/twirptest/importer_local/importer_local_pb2.py b/internal/twirptest/importer_local/importer_local_pb2.py