diff options
| author |  Sree Kuchibhotla <sreek@google.com> | 2017-09-20 11:41:46 -0700 |
|---|---|---|
| committer | Sree Kuchibhotla <sreek@google.com> | 2017-09-20 11:41:46 -0700 |
| commit | a27764e5939fd4ca866d4fd453448cc6d4b87e06 (patch) | |
| tree | e69fc12aa9be99f98627ea12cdcb69172c52eb43 /src/python/grpcio_testing/grpc_testing/__init__.py | |
| parent | e16329dd5f2be074ce72564666e83a33e34e468c (diff) | |
| parent | 31aea7ee3a2c188d805cdf0b7be6ae446720bc43 (diff) | |
Merge branch 'master' into debug-timers
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 917e11808e..994274500c 100644 --- a/src/python/grpcio_testing/grpc_testing/__init__.py +++ b/src/python/grpcio_testing/grpc_testing/__init__.py @@ -213,7 +213,7 @@ class StreamStreamChannelRpc(six.with_metaclass(abc.ABCMeta)): raise NotImplementedError() -class Channel(six.with_metaclass(abc.ABCMeta), grpc.Channel): +class Channel(six.with_metaclass(abc.ABCMeta, grpc.Channel)): """A grpc.Channel double with which to test a system that invokes RPCs.""" @abc.abstractmethod |