From d866fb618431dc2f63c40745e6b6760df7ad34c1 Mon Sep 17 00:00:00 2001 From: Jake Yip Date: Fri, 22 Feb 2019 16:28:58 +1100 Subject: [PATCH] Fix async reserved word in python3.7 kubernetes-client has patched this [1]. To retain backwards compatibility, we can use **kwargs to handle async/async_req arguments [1]: https://github.com/kubernetes-client/python/commit/b10c7b6a175ab96291a6f74d68ea6027151f3b71 Change-Id: I8e738b4f99091786dd76e081bffa36ef5ab70085 --- magnum/conductor/k8s_api.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/magnum/conductor/k8s_api.py b/magnum/conductor/k8s_api.py index b72b362462..d0e8396125 100755 --- a/magnum/conductor/k8s_api.py +++ b/magnum/conductor/k8s_api.py @@ -45,10 +45,10 @@ class ApiClient(api_client.ApiClient): def call_api(self, resource_path, method, path_params=None, query_params=None, header_params=None, - body=None, post_params=None, files=None, async=None, - response_type=None, auth_settings=None, async_req=None, + body=None, post_params=None, files=None, + response_type=None, auth_settings=None, _return_http_data_only=None, collection_formats=None, - _preload_content=True, _request_timeout=None): + _preload_content=True, _request_timeout=None, **kwargs): """Makes http request (synchronous) and return the deserialized data :param resource_path: Path to method endpoint. @@ -64,8 +64,6 @@ class ApiClient(api_client.ApiClient): :param response: Response data type. :param files dict: key -> filename, value -> filepath, for `multipart/form-data`. - :param async bool: to be compatible with k8s-client before 7.0.0 - :param async_req bool: execute request asynchronously :param _return_http_data_only: response data without head status code and headers :param collection_formats: dict of collection formats for path, query,