diff options
| author |  Nathaniel Manista <nathaniel@google.com> | 2017-12-03 22:24:31 +0000 |
|---|---|---|
| committer | Nathaniel Manista <nathaniel@google.com> | 2017-12-03 22:33:19 +0000 |
| commit | dfe8403280b27f0577af82ba216d81fd47375675 (patch) | |
| tree | 99b1bc2128b0d080933b10ddef2f9903e603d711 /src/python/grpcio/grpc/__init__.py | |
| parent | 992b8c10b437ba4d30444bedea73628cd0ec8b15 (diff) | |
Change client-side credentials' use of gRPC Core
Rather than allocating gRPC Core memory when instantiated and
retaining it until deleted, gRPC Python's credentials objects now
offer methods to create gRPC Core structures on demand.
Diffstat (limited to 'src/python/grpcio/grpc/__init__.py')
| -rw-r--r-- | src/python/grpcio/grpc/__init__.py | 35 |
1 files changed, 13 insertions, 22 deletions
diff --git a/src/python/grpcio/grpc/__init__.py b/src/python/grpcio/grpc/__init__.py index 019783bd88..564772527e 100644 --- a/src/python/grpcio/grpc/__init__.py +++ b/src/python/grpcio/grpc/__init__.py @@ -1148,12 +1148,9 @@ def ssl_channel_credentials(root_certificates=None, Returns: A ChannelCredentials for use with an SSL-enabled Channel. """ - if private_key is not None or certificate_chain is not None: - pair = _cygrpc.SslPemKeyCertPair(private_key, certificate_chain) - else: - pair = None return ChannelCredentials( - _cygrpc.channel_credentials_ssl(root_certificates, pair)) + _cygrpc.SSLChannelCredentials(root_certificates, private_key, + certificate_chain)) def metadata_call_credentials(metadata_plugin, name=None): @@ -1167,9 +1164,8 @@ def metadata_call_credentials(metadata_plugin, name=None): A CallCredentials. """ from grpc import _plugin_wrapping # pylint: disable=cyclic-import - return CallCredentials( - _plugin_wrapping.metadata_plugin_call_credentials(metadata_plugin, - name)) + return _plugin_wrapping.metadata_plugin_call_credentials(metadata_plugin, + name) def access_token_call_credentials(access_token): @@ -1185,9 +1181,8 @@ def access_token_call_credentials(access_token): """ from grpc import _auth # pylint: disable=cyclic-import from grpc import _plugin_wrapping # pylint: disable=cyclic-import - return CallCredentials( - _plugin_wrapping.metadata_plugin_call_credentials( - _auth.AccessTokenAuthMetadataPlugin(access_token), None)) + return _plugin_wrapping.metadata_plugin_call_credentials( + _auth.AccessTokenAuthMetadataPlugin(access_token), None) def composite_call_credentials(*call_credentials): @@ -1199,12 +1194,10 @@ def composite_call_credentials(*call_credentials): Returns: A CallCredentials object composed of the given CallCredentials objects. """ - from grpc import _credential_composition # pylint: disable=cyclic-import - cygrpc_call_credentials = tuple( - single_call_credentials._credentials - for single_call_credentials in call_credentials) return CallCredentials( - _credential_composition.call(cygrpc_call_credentials)) + _cygrpc.CompositeCallCredentials( + tuple(single_call_credentials._credentials + for single_call_credentials in call_credentials))) def composite_channel_credentials(channel_credentials, *call_credentials): @@ -1218,13 +1211,11 @@ def composite_channel_credentials(channel_credentials, *call_credentials): A ChannelCredentials composed of the given ChannelCredentials and CallCredentials objects. """ - from grpc import _credential_composition # pylint: disable=cyclic-import - cygrpc_call_credentials = tuple( - single_call_credentials._credentials - for single_call_credentials in call_credentials) return ChannelCredentials( - _credential_composition.channel(channel_credentials._credentials, - cygrpc_call_credentials)) + _cygrpc.CompositeChannelCredentials( + tuple(single_call_credentials._credentials + for single_call_credentials in call_credentials), + channel_credentials._credentials)) def ssl_server_credentials(private_key_certificate_chain_pairs, |