aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/python/grpcio_testing
diff options
context:
space:
mode:
authorGravatar Nathaniel Manista <nathaniel@google.com>2017-09-18 14:22:16 +0000
committerGravatar Nathaniel Manista <nathaniel@google.com>2017-09-18 14:22:16 +0000
commit86eb4ec0ef68482faa960801899be964e545a8b2 (patch)
treec78aca439e9d32bc63499801c76204a5f4fe9df8 /src/python/grpcio_testing
parent22e89a8b57d845fc4a9da2c826dda9207ae46efe (diff)
Fix a six.with_metaclass usage mistake
I made this mistake in 2010985ab269c8df0443e4f3782cbdffb083e9d4 but only with yesterday's release of six 1.11.0 has it started failing ("TypeError: metaclass conflict: the metaclassof a derived class must be a (non-strict) subclass of the metaclasses of all its bases").
Diffstat (limited to 'src/python/grpcio_testing')
-rw-r--r--src/python/grpcio_testing/grpc_testing/__init__.py2
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