diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-09-07 08:39:05 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-09-07 08:39:05 -0700 |
| commit | 344834b40b10a646b73f2484114f338512490cf0 (patch) | |
| tree | 1561c2f2d2bdf5c6c52cfdfc80c1aa98a6a4b242 /src/python | |
| parent | 78dc25e86b090c7fa26e77ce6521a30002d150be (diff) | |
| parent | e0321637d798fdeb21e79c376f1c26298764cac4 (diff) | |
Merge github.com:grpc/grpc into grand-unified-closures
Diffstat (limited to 'src/python')
| -rw-r--r-- | src/python/grpcio/grpc_core_dependencies.py | 1 | ||||
| -rw-r--r-- | src/python/grpcio_tests/setup.py | 4 |
2 files changed, 1 insertions, 4 deletions
diff --git a/src/python/grpcio/grpc_core_dependencies.py b/src/python/grpcio/grpc_core_dependencies.py index 1ae412e2c5..d53f46b18b 100644 --- a/src/python/grpcio/grpc_core_dependencies.py +++ b/src/python/grpcio/grpc_core_dependencies.py @@ -52,6 +52,7 @@ CORE_SOURCE_FILES = [ 'src/core/lib/support/log_windows.c', 'src/core/lib/support/mpscq.c', 'src/core/lib/support/murmur_hash.c', + 'src/core/lib/support/percent_encoding.c', 'src/core/lib/support/slice.c', 'src/core/lib/support/slice_buffer.c', 'src/core/lib/support/stack_lockfree.c', diff --git a/src/python/grpcio_tests/setup.py b/src/python/grpcio_tests/setup.py index 3524355cbf..7384206602 100644 --- a/src/python/grpcio_tests/setup.py +++ b/src/python/grpcio_tests/setup.py @@ -31,13 +31,9 @@ import os import os.path -import shutil import sys -from distutils import core as _core -from distutils import extension as _extension import setuptools -from setuptools.command import egg_info import grpc.tools.command |