aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools/distrib/python/grpcio_tools/grpc
diff options
context:
space:
mode:
authorGravatar Jan Tattermusch <jtattermusch@google.com>2016-05-06 12:28:58 -0700
committerGravatar Jan Tattermusch <jtattermusch@google.com>2016-05-06 12:28:58 -0700
commit4e2f7727a9d39b58d6e3d083a7ed9a5aa6bb5fcc (patch)
treed953abcc972fcbd2997ae4ea812f68dd0792e6ca /tools/distrib/python/grpcio_tools/grpc
parent6f0fe0f32728dfa781e49451a755d73df5fa6a88 (diff)
rename grpc.protoc.compiler to grpc.tools.protoc
Diffstat (limited to 'tools/distrib/python/grpcio_tools/grpc')
-rw-r--r--tools/distrib/python/grpcio_tools/grpc/tools/__init__.py (renamed from tools/distrib/python/grpcio_tools/grpc/protoc/__init__.py)0
-rw-r--r--tools/distrib/python/grpcio_tools/grpc/tools/main.cc (renamed from tools/distrib/python/grpcio_tools/grpc/protoc/main.cc)2
-rw-r--r--tools/distrib/python/grpcio_tools/grpc/tools/main.h (renamed from tools/distrib/python/grpcio_tools/grpc/protoc/main.h)0
-rw-r--r--tools/distrib/python/grpcio_tools/grpc/tools/protoc.py (renamed from tools/distrib/python/grpcio_tools/grpc/protoc/compiler.py)2
-rw-r--r--tools/distrib/python/grpcio_tools/grpc/tools/protoc_compiler.pyx (renamed from tools/distrib/python/grpcio_tools/grpc/protoc/protoc_compiler.pyx)2
5 files changed, 3 insertions, 3 deletions
diff --git a/tools/distrib/python/grpcio_tools/grpc/protoc/__init__.py b/tools/distrib/python/grpcio_tools/grpc/tools/__init__.py
index d5ad73a74a..d5ad73a74a 100644
--- a/tools/distrib/python/grpcio_tools/grpc/protoc/__init__.py
+++ b/tools/distrib/python/grpcio_tools/grpc/tools/__init__.py
diff --git a/tools/distrib/python/grpcio_tools/grpc/protoc/main.cc b/tools/distrib/python/grpcio_tools/grpc/tools/main.cc
index c9936a3a6b..81675b4e6f 100644
--- a/tools/distrib/python/grpcio_tools/grpc/protoc/main.cc
+++ b/tools/distrib/python/grpcio_tools/grpc/tools/main.cc
@@ -32,7 +32,7 @@
#include "src/compiler/python_generator.h"
-#include "grpc/protoc/main.h"
+#include "grpc/tools/main.h"
int protoc_main(int argc, char* argv[]) {
google::protobuf::compiler::CommandLineInterface cli;
diff --git a/tools/distrib/python/grpcio_tools/grpc/protoc/main.h b/tools/distrib/python/grpcio_tools/grpc/tools/main.h
index ea2860ff02..ea2860ff02 100644
--- a/tools/distrib/python/grpcio_tools/grpc/protoc/main.h
+++ b/tools/distrib/python/grpcio_tools/grpc/tools/main.h
diff --git a/tools/distrib/python/grpcio_tools/grpc/protoc/compiler.py b/tools/distrib/python/grpcio_tools/grpc/tools/protoc.py
index caafc544b2..b4dd0ecae2 100644
--- a/tools/distrib/python/grpcio_tools/grpc/protoc/compiler.py
+++ b/tools/distrib/python/grpcio_tools/grpc/tools/protoc.py
@@ -31,7 +31,7 @@
import sys
-from grpc.protoc import protoc_compiler
+from grpc.tools import protoc_compiler
if __name__ == '__main__':
diff --git a/tools/distrib/python/grpcio_tools/grpc/protoc/protoc_compiler.pyx b/tools/distrib/python/grpcio_tools/grpc/tools/protoc_compiler.pyx
index af15f3db30..a6530127c0 100644
--- a/tools/distrib/python/grpcio_tools/grpc/protoc/protoc_compiler.pyx
+++ b/tools/distrib/python/grpcio_tools/grpc/tools/protoc_compiler.pyx
@@ -29,7 +29,7 @@
from libc cimport stdlib
-cdef extern from "grpc/protoc/main.h":
+cdef extern from "grpc/tools/main.h":
int protoc_main(int argc, char *argv[])
def run_main(list args not None):