diff options
| author |  Mark D. Roth <roth@google.com> | 2016-09-07 09:14:50 -0700 |
|---|---|---|
| committer | Mark D. Roth <roth@google.com> | 2016-09-07 09:14:50 -0700 |
| commit | 164f0e926deba3a7d95a79be5aba25452d15d697 (patch) | |
| tree | 95cbc72bcc07e304946fcec2941e5c72a5849768 /src/python | |
| parent | 0209f675c44fc87f35cabd9c2ea623101e8e1cb0 (diff) | |
| parent | 61a420e9966e0b628c710bd4c2db2409bc1cfad9 (diff) | |
Merge remote-tracking branch 'upstream/master' into http_connect
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 dcfc0edd20..a25621aee6 100644 --- a/src/python/grpcio/grpc_core_dependencies.py +++ b/src/python/grpcio/grpc_core_dependencies.py @@ -51,6 +51,7 @@ CORE_SOURCE_FILES = [ 'src/core/lib/support/log_posix.c', 'src/core/lib/support/log_windows.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 |