diff options
| author |  Nathaniel Manista <nathaniel@google.com> | 2017-09-29 04:22:16 +0000 |
|---|---|---|
| committer | Nathaniel Manista <nathaniel@google.com> | 2017-09-29 05:04:49 +0000 |
| commit | 103991eb73aba3cd4cf9b58f7fca963404233148 (patch) | |
| tree | 914b12805d54c5a9bf113640552332185ff21a68 /src/python/grpcio | |
| parent | 3efe754799ac46f7be6502ba3e20a39743d9fb0d (diff) | |
Devolve staticmethod to ordinary function
Diffstat (limited to 'src/python/grpcio')
| -rw-r--r-- | src/python/grpcio/grpc/_cython/_cygrpc/credentials.pxd.pxi | 3 | ||||
| -rw-r--r-- | src/python/grpcio/grpc/_cython/_cygrpc/credentials.pyx.pxi | 22 |
2 files changed, 13 insertions, 12 deletions
diff --git a/src/python/grpcio/grpc/_cython/_cygrpc/credentials.pxd.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/credentials.pxd.pxi index a0e69dd613..918ba7c7a0 100644 --- a/src/python/grpcio/grpc/_cython/_cygrpc/credentials.pxd.pxi +++ b/src/python/grpcio/grpc/_cython/_cygrpc/credentials.pxd.pxi @@ -41,7 +41,8 @@ cdef class CredentialsMetadataPlugin: cdef object plugin_callback cdef bytes plugin_name - cdef grpc_metadata_credentials_plugin make_c_plugin(self) + +cdef grpc_metadata_credentials_plugin _c_plugin(CredentialsMetadataPlugin plugin) cdef class AuthMetadataContext: diff --git a/src/python/grpcio/grpc/_cython/_cygrpc/credentials.pyx.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/credentials.pyx.pxi index 57816f1cab..92b9d65d71 100644 --- a/src/python/grpcio/grpc/_cython/_cygrpc/credentials.pyx.pxi +++ b/src/python/grpcio/grpc/_cython/_cygrpc/credentials.pyx.pxi @@ -89,20 +89,20 @@ cdef class CredentialsMetadataPlugin: self.plugin_callback = plugin_callback self.plugin_name = name - @staticmethod - cdef grpc_metadata_credentials_plugin make_c_plugin(self): - cdef grpc_metadata_credentials_plugin result - result.get_metadata = plugin_get_metadata - result.destroy = plugin_destroy_c_plugin_state - result.state = <void *>self - result.type = self.plugin_name - cpython.Py_INCREF(self) - return result - def __dealloc__(self): grpc_shutdown() +cdef grpc_metadata_credentials_plugin _c_plugin(CredentialsMetadataPlugin plugin): + cdef grpc_metadata_credentials_plugin c_plugin + c_plugin.get_metadata = plugin_get_metadata + c_plugin.destroy = plugin_destroy_c_plugin_state + c_plugin.state = <void *>plugin + c_plugin.type = plugin.plugin_name + cpython.Py_INCREF(plugin) + return c_plugin + + cdef class AuthMetadataContext: def __cinit__(self): @@ -239,7 +239,7 @@ def call_credentials_google_iam(authorization_token, authority_selector): def call_credentials_metadata_plugin(CredentialsMetadataPlugin plugin): cdef CallCredentials credentials = CallCredentials() - cdef grpc_metadata_credentials_plugin c_plugin = plugin.make_c_plugin() + cdef grpc_metadata_credentials_plugin c_plugin = _c_plugin(plugin) with nogil: credentials.c_credentials = ( grpc_metadata_credentials_create_from_plugin(c_plugin, NULL)) |