diff options
author | 2017-12-13 14:44:29 -0800 | |
---|---|---|
committer | 2017-12-13 14:44:29 -0800 | |
commit | 54d699ddda18e8aca7a556ad3c38d1684efc88ec (patch) | |
tree | b0ecaaf07074bdcde6c3315f647cc04417da7b90 /src/python/grpcio_testing/grpc_testing/_channel/__init__.py | |
parent | 62d86e9987121c8bd79d4594fb0db019c4faafad (diff) | |
parent | 91a851c6e1f6bc7c1dbf84ea12558d535c911252 (diff) |
Merge branch 'master' of github.com:grpc/grpc into backoff_cpp
Diffstat (limited to 'src/python/grpcio_testing/grpc_testing/_channel/__init__.py')
-rw-r--r-- | src/python/grpcio_testing/grpc_testing/_channel/__init__.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/python/grpcio_testing/grpc_testing/_channel/__init__.py b/src/python/grpcio_testing/grpc_testing/_channel/__init__.py index 8011975d0a..7a64cda889 100644 --- a/src/python/grpcio_testing/grpc_testing/_channel/__init__.py +++ b/src/python/grpcio_testing/grpc_testing/_channel/__init__.py @@ -20,4 +20,6 @@ from grpc_testing._channel import _channel_state # pylint: disable=unused-argument def testing_channel(descriptors, time): return _channel.TestingChannel(time, _channel_state.State()) + + # pylint: enable=unused-argument |