Merge pull request #18202 from apolcyn/backport_fix
Backport #18201 to 1.19.x
diff --git a/src/csharp/doc/docfx.json b/src/csharp/doc/docfx.json
index 0ce5f72..36bf657 100644
--- a/src/csharp/doc/docfx.json
+++ b/src/csharp/doc/docfx.json
@@ -3,7 +3,8 @@
{
"src": [
{
- "files": ["Grpc.Core/Grpc.Core.csproj",
+ "files": ["Grpc.Core.Api/Grpc.Core.Api.csproj",
+ "Grpc.Core/Grpc.Core.csproj",
"Grpc.Auth/Grpc.Auth.csproj",
"Grpc.Core.Testing/Grpc.Core.Testing.csproj",
"Grpc.HealthCheck/Grpc.HealthCheck.csproj",
diff --git a/src/python/grpcio/grpc/_channel.py b/src/python/grpcio/grpc/_channel.py
index df06ffa..2d370fc 100644
--- a/src/python/grpcio/grpc/_channel.py
+++ b/src/python/grpcio/grpc/_channel.py
@@ -247,7 +247,7 @@
consumption_thread.start()
-class _Rendezvous(grpc.RpcError, grpc.Future, grpc.Call):
+class _Rendezvous(grpc.RpcError, grpc.Future, grpc.Call): # pylint: disable=too-many-ancestors
def __init__(self, state, call, response_deserializer, deadline):
super(_Rendezvous, self).__init__()
diff --git a/src/python/grpcio/grpc/_interceptor.py b/src/python/grpcio/grpc/_interceptor.py
index fc0ad77..6c4e396 100644
--- a/src/python/grpcio/grpc/_interceptor.py
+++ b/src/python/grpcio/grpc/_interceptor.py
@@ -80,7 +80,7 @@
return method, timeout, metadata, credentials, wait_for_ready
-class _FailureOutcome(grpc.RpcError, grpc.Future, grpc.Call):
+class _FailureOutcome(grpc.RpcError, grpc.Future, grpc.Call): # pylint: disable=too-many-ancestors
def __init__(self, exception, traceback):
super(_FailureOutcome, self).__init__()
@@ -126,7 +126,7 @@
def traceback(self, ignored_timeout=None):
return self._traceback
- def add_callback(self, callback):
+ def add_callback(self, unused_callback):
return False
def add_done_callback(self, fn):
