AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Match service argument names to abstract interface (#9418)

Browse Source 
The base class/documentation suggest that the argument
names are `self` and `done`, while the runtime used
argument names `srvc` and `callback`.

`mypy.stubtest` was able to identify this - as it compares
the types (autogenerated by
[`mypy-protobuf`](https://github.com/dropbox/mypy-protobuf/))
to the actual code generated by protoc at runtime.

Since the stubs assume the generated code matches the abstract
interface in service.py - it saw these differences.
This commit is contained in:
Nipunn Koorapati 2022-02-03 09:14:44 -08:00 committed by GitHub
parent 8495372e1e
commit 937b56f57b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CONTRIBUTORS.txt
View File

@ -100,3 +100,8 @@ Patch contributors:
Andrew Paprocki <andrew@ishiboo.com> Andrew Paprocki <andrew@ishiboo.com>
* Fixed minor IBM xlC compiler build issues * Fixed minor IBM xlC compiler build issues
* Added atomicops for AIX (POWER) * Added atomicops for AIX (POWER)
Nipunn Koorapati <nipunn1313@gmail.com>
* Provide a type alias field ValueType on EnumTypeWrapper
* Match service argument names to abstract interface

29
python/google/protobuf/service_reflection.py
View File

@ -133,7 +133,7 @@ class _ServiceBuilder(object):
""" """
self.descriptor = service_descriptor self.descriptor = service_descriptor
def BuildService(self, cls): def BuildService(builder, cls):
"""Constructs the service class. """Constructs the service class.
Args: Args:
@ -143,18 +143,25 @@ class _ServiceBuilder(object):
# CallMethod needs to operate with an instance of the Service class. This # CallMethod needs to operate with an instance of the Service class. This
# internal wrapper function exists only to be able to pass the service # internal wrapper function exists only to be able to pass the service
# instance to the method that does the real CallMethod work. # instance to the method that does the real CallMethod work.
def _WrapCallMethod(srvc, method_descriptor, # Making sure to use exact argument names from the abstract interface in
rpc_controller, request, callback): # service.py to match the type signature
return self._CallMethod(srvc, method_descriptor, def _WrapCallMethod(self, method_descriptor,
rpc_controller, request, callback) rpc_controller, request, done):
self.cls = cls return builder._CallMethod(self, method_descriptor,
rpc_controller, request, done)
def _WrapGetRequestClass(self, method_descriptor):
return builder._GetRequestClass(method_descriptor)
def _WrapGetResponseClass(self, method_descriptor):
return builder._GetResponseClass(method_descriptor)
builder.cls = cls
cls.CallMethod = _WrapCallMethod cls.CallMethod = _WrapCallMethod
cls.GetDescriptor = staticmethod(lambda: self.descriptor) cls.GetDescriptor = staticmethod(lambda: builder.descriptor)
cls.GetDescriptor.__doc__ = "Returns the service descriptor." cls.GetDescriptor.__doc__ = "Returns the service descriptor."
cls.GetRequestClass = self._GetRequestClass cls.GetRequestClass = _WrapGetRequestClass
cls.GetResponseClass = self._GetResponseClass cls.GetResponseClass = _WrapGetResponseClass
for method in self.descriptor.methods: for method in builder.descriptor.methods:
setattr(cls, method.name, self._GenerateNonImplementedMethod(method)) setattr(cls, method.name, builder._GenerateNonImplementedMethod(method))
def _CallMethod(self, srvc, method_descriptor, def _CallMethod(self, srvc, method_descriptor,
rpc_controller, request, callback): rpc_controller, request, callback):