diff options
| author |  Ken Payson <kpayson@google.com> | 2016-06-13 09:27:40 -0700 |
|---|---|---|
| committer | Ken Payson <kpayson@google.com> | 2016-06-13 15:08:57 -0700 |
| commit | f24665fdd8a69927c482902d9780e953f5a37a04 (patch) | |
| tree | 58514ebf1ca68162db14d947ceacc74755e3b461 /src | |
| parent | 68e5ecbee4882a74b16a6e22d935d68798016804 (diff) | |
Fix create_[secure/insecure]_channel argument order
Diffstat (limited to 'src')
| -rw-r--r-- | src/python/grpcio/grpc/__init__.py | 4 | ||||
| -rw-r--r-- | src/python/grpcio/tests/unit/beta/test_utilities.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/python/grpcio/grpc/__init__.py b/src/python/grpcio/grpc/__init__.py index 5ba5a4e1fd..2cedb19b6d 100644 --- a/src/python/grpcio/grpc/__init__.py +++ b/src/python/grpcio/grpc/__init__.py @@ -1059,7 +1059,7 @@ def insecure_channel(target, options=None): A Channel to the target through which RPCs may be conducted. """ from grpc import _channel - return _channel.Channel(target, None, options) + return _channel.Channel(target, options, None) def secure_channel(target, credentials, options=None): @@ -1075,7 +1075,7 @@ def secure_channel(target, credentials, options=None): A Channel to the target through which RPCs may be conducted. """ from grpc import _channel - return _channel.Channel(target, credentials, options) + return _channel.Channel(target, options, credentials) def server(generic_rpc_handlers, thread_pool, options=None): diff --git a/src/python/grpcio/tests/unit/beta/test_utilities.py b/src/python/grpcio/tests/unit/beta/test_utilities.py index 66b5f72897..e374b203ce 100644 --- a/src/python/grpcio/tests/unit/beta/test_utilities.py +++ b/src/python/grpcio/tests/unit/beta/test_utilities.py @@ -50,6 +50,6 @@ def not_really_secure_channel( """ target = '%s:%d' % (host, port) channel = grpc.secure_channel( - target, ((b'grpc.ssl_target_name_override', server_host_override,),), - channel_credentials._credentials) + target, channel_credentials._credentials, + ((b'grpc.ssl_target_name_override', server_host_override,),)) return implementations.Channel(channel) |