diff options
| author |  ncteisen <ncteisen@gmail.com> | 2018-06-13 23:00:07 -0700 |
|---|---|---|
| committer | ncteisen <ncteisen@gmail.com> | 2018-06-13 23:00:07 -0700 |
| commit | f92460e539405bbca98af3547edd3150d0fcca40 (patch) | |
| tree | dea35a54d1f6db8135df398c6e5a328ba3489609 /src/python/grpcio_testing/grpc_testing/__init__.py | |
| parent | 19ac7c0baf298be51c0dbfa7d5bcd1f45eec7c78 (diff) | |
| parent | 9a2c0a8641d1837185a60436adf9419209f89fbe (diff) | |
Merge branch 'master' of https://github.com/grpc/grpc into channelz
Diffstat (limited to 'src/python/grpcio_testing/grpc_testing/__init__.py')
| -rw-r--r-- | src/python/grpcio_testing/grpc_testing/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/python/grpcio_testing/grpc_testing/__init__.py b/src/python/grpcio_testing/grpc_testing/__init__.py index e87d0ffc96..65fdd1b8ca 100644 --- a/src/python/grpcio_testing/grpc_testing/__init__.py +++ b/src/python/grpcio_testing/grpc_testing/__init__.py @@ -14,9 +14,9 @@ """Objects for use in testing gRPC Python-using application code.""" import abc +import six from google.protobuf import descriptor -import six import grpc |