diff options
| author |  Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2016-08-24 00:08:49 +0200 |
|---|---|---|
| committer | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2016-08-24 00:08:49 +0200 |
| commit | cdbe6b3963528167ba581fb039b8fa9e5e0ea34f (patch) | |
| tree | 880d2bde69f1062411af1e89f1c9cb45229466fb /src/python | |
| parent | 668bf881a9449cc4f9885e4d3492e2cbe7476925 (diff) | |
| parent | d7ff4ff40071d2b486a052183e3e9f9382afb745 (diff) | |
Merge branch 'v1.0.x' into upmerge-from-v1.0.x
Diffstat (limited to 'src/python')
| -rw-r--r-- | src/python/grpcio_tests/setup.py | 4 |
1 files changed, 0 insertions, 4 deletions
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 |