Merge pull request #8401 from tomplus/feat/python37

feat: support for python3.7 (async is a keyword)

modules/swagger-codegen/src/main/resources/python/api.mustache

@@ -33,16 +33,16 @@ class {{classname}}(object):
  {{{notes}}} # noqa: E501
 {{/notes}}
  This method makes a synchronous HTTP request by default. To make an
- asynchronous HTTP request, please pass async=True
+ asynchronous HTTP request, please pass async_req=True
 {{#sortParamsByRequiredFlag}}
- >>> thread = api.{{operationId}}({{#allParams}}{{#required}}{{paramName}}, {{/required}}{{/allParams}}async=True)
+ >>> thread = api.{{operationId}}({{#allParams}}{{#required}}{{paramName}}, {{/required}}{{/allParams}}async_req=True)
 {{/sortParamsByRequiredFlag}}
 {{^sortParamsByRequiredFlag}}
- >>> thread = api.{{operationId}}({{#allParams}}{{#required}}{{paramName}}={{paramName}}_value, {{/required}}{{/allParams}}async=True)
+ >>> thread = api.{{operationId}}({{#allParams}}{{#required}}{{paramName}}={{paramName}}_value, {{/required}}{{/allParams}}async_req=True)
 {{/sortParamsByRequiredFlag}}
  >>> result = thread.get()
 
- :param async bool
+ :param async_req bool
 {{#allParams}}
  :param {{dataType}} {{paramName}}:{{#description}} {{{description}}}{{/description}}{{#required}} (required){{/required}}{{#optional}}(optional){{/optional}}
 {{/allParams}}
@@ -51,7 +51,7 @@ class {{classname}}(object):
  returns the request thread.
  """
  kwargs['_return_http_data_only'] = True
- if kwargs.get('async'):
+ if kwargs.get('async_req'):
  return self.{{operationId}}_with_http_info({{#sortParamsByRequiredFlag}}{{#allParams}}{{#required}}{{paramName}}, {{/required}}{{/allParams}}{{/sortParamsByRequiredFlag}}**kwargs) # noqa: E501
  else:
  (data) = self.{{operationId}}_with_http_info({{#sortParamsByRequiredFlag}}{{#allParams}}{{#required}}{{paramName}}, {{/required}}{{/allParams}}{{/sortParamsByRequiredFlag}}**kwargs) # noqa: E501
@@ -64,16 +64,16 @@ class {{classname}}(object):
  {{{notes}}} # noqa: E501
 {{/notes}}
  This method makes a synchronous HTTP request by default. To make an
- asynchronous HTTP request, please pass async=True
+ asynchronous HTTP request, please pass async_req=True
 {{#sortParamsByRequiredFlag}}
- >>> thread = api.{{operationId}}_with_http_info({{#allParams}}{{#required}}{{paramName}}, {{/required}}{{/allParams}}async=True)
+ >>> thread = api.{{operationId}}_with_http_info({{#allParams}}{{#required}}{{paramName}}, {{/required}}{{/allParams}}async_req=True)
 {{/sortParamsByRequiredFlag}}
 {{^sortParamsByRequiredFlag}}
- >>> thread = api.{{operationId}}_with_http_info({{#allParams}}{{#required}}{{paramName}}={{paramName}}_value, {{/required}}{{/allParams}}async=True)
+ >>> thread = api.{{operationId}}_with_http_info({{#allParams}}{{#required}}{{paramName}}={{paramName}}_value, {{/required}}{{/allParams}}async_req=True)
 {{/sortParamsByRequiredFlag}}
  >>> result = thread.get()
 
- :param async bool
+ :param async_req bool
 {{#allParams}}
  :param {{dataType}} {{paramName}}:{{#description}} {{{description}}}{{/description}}{{#required}} (required){{/required}}{{#optional}}(optional{{#defaultValue}}, default to {{{.}}}{{/defaultValue}}){{/optional}}
 {{/allParams}}
@@ -83,7 +83,7 @@ class {{classname}}(object):
  """
 
  all_params = [{{#allParams}}'{{paramName}}'{{#hasMore}}, {{/hasMore}}{{/allParams}}] # noqa: E501
- all_params.append('async')
+ all_params.append('async_req')
  all_params.append('_return_http_data_only')
  all_params.append('_preload_content')
  all_params.append('_request_timeout')
@@ -205,7 +205,7 @@ class {{classname}}(object):
  files=local_var_files,
  response_type={{#returnType}}'{{returnType}}'{{/returnType}}{{^returnType}}None{{/returnType}}, # noqa: E501
  auth_settings=auth_settings,
- async=params.get('async'),
+ async_req=params.get('async_req'),
  _return_http_data_only=params.get('_return_http_data_only'),
  _preload_content=params.get('_preload_content', True),
  _request_timeout=params.get('_request_timeout'),

modules/swagger-codegen/src/main/resources/python/api_client.mustache

@@ -280,12 +280,12 @@ class ApiClient(object):
  def call_api(self, resource_path, method,
  path_params=None, query_params=None, header_params=None,
  body=None, post_params=None, files=None,
- response_type=None, auth_settings=None, async=None,
+ response_type=None, auth_settings=None, async_req=None,
  _return_http_data_only=None, collection_formats=None,
  _preload_content=True, _request_timeout=None):
  """Makes the HTTP request (synchronous) and returns deserialized data.
 
- To make an async request, set the async parameter.
+ To make an async request, set the async_req parameter.
 
  :param resource_path: Path to method endpoint.
  :param method: Method to call.
@@ -300,7 +300,7 @@ class ApiClient(object):
  :param response: Response data type.
  :param files dict: key -> filename, value -> filepath,
  for `multipart/form-data`.
- :param async bool: execute request asynchronously
+ :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,
@@ -313,13 +313,13 @@ class ApiClient(object):
  timeout. It can also be a pair (tuple) of
  (connection, read) timeouts.
  :return:
- If async parameter is True,
+ If async_req parameter is True,
  the request will be called asynchronously.
  The method will return the request thread.
- If parameter async is False or missing,
+ If parameter async_req is False or missing,
  then the method will return the response directly.
  """
- if not async:
+ if not async_req:
  return self.__call_api(resource_path, method,
  path_params, query_params, header_params,
  body, post_params, files,

samples/client/petstore/python-asyncio/README.md

@@ -50,8 +50,9 @@ import time
 import petstore_api
 from petstore_api.rest import ApiException
 from pprint import pprint
+
 # create an instance of the API class
-api_instance = petstore_api.AnotherFakeApi()
+api_instance = petstore_api.AnotherFakeApi(petstore_api.ApiClient(configuration))
 body = petstore_api.Client() # Client | client model
 
 try:
@@ -74,6 +75,7 @@ Class | Method | HTTP request | Description
 *FakeApi* | [**fake_outer_composite_serialize**](docs/FakeApi.md#fake_outer_composite_serialize) | **POST** /fake/outer/composite | 
 *FakeApi* | [**fake_outer_number_serialize**](docs/FakeApi.md#fake_outer_number_serialize) | **POST** /fake/outer/number | 
 *FakeApi* | [**fake_outer_string_serialize**](docs/FakeApi.md#fake_outer_string_serialize) | **POST** /fake/outer/string | 
+*FakeApi* | [**test_body_with_query_params**](docs/FakeApi.md#test_body_with_query_params) | **PUT** /fake/body-with-query-params | 
 *FakeApi* | [**test_client_model**](docs/FakeApi.md#test_client_model) | **PATCH** /fake | To test \"client\" model
 *FakeApi* | [**test_endpoint_parameters**](docs/FakeApi.md#test_endpoint_parameters) | **POST** /fake | Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
 *FakeApi* | [**test_enum_parameters**](docs/FakeApi.md#test_enum_parameters) | **GET** /fake | To test enum parameters

samples/client/petstore/python-asyncio/docs/EnumTest.md

@@ -4,6 +4,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **enum_string** | **str** | | [optional] 
+**enum_string_required** | **str** | | 
 **enum_integer** | **int** | | [optional] 
 **enum_number** | **float** | | [optional] 
 **outer_enum** | [**OuterEnum**](OuterEnum.md) | | [optional] 

samples/client/petstore/python-asyncio/docs/FakeApi.md

@@ -8,6 +8,7 @@ Method | HTTP request | Description
 [**fake_outer_composite_serialize**](FakeApi.md#fake_outer_composite_serialize) | **POST** /fake/outer/composite | 
 [**fake_outer_number_serialize**](FakeApi.md#fake_outer_number_serialize) | **POST** /fake/outer/number | 
 [**fake_outer_string_serialize**](FakeApi.md#fake_outer_string_serialize) | **POST** /fake/outer/string | 
+[**test_body_with_query_params**](FakeApi.md#test_body_with_query_params) | **PUT** /fake/body-with-query-params | 
 [**test_client_model**](FakeApi.md#test_client_model) | **PATCH** /fake | To test \"client\" model
 [**test_endpoint_parameters**](FakeApi.md#test_endpoint_parameters) | **POST** /fake | Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
 [**test_enum_parameters**](FakeApi.md#test_enum_parameters) | **GET** /fake | To test enum parameters
@@ -203,6 +204,52 @@ No authorization required
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
+# **test_body_with_query_params**
+> test_body_with_query_params(body, query)
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import petstore_api
+from petstore_api.rest import ApiException
+from pprint import pprint
+
+# create an instance of the API class
+api_instance = petstore_api.FakeApi()
+body = petstore_api.User() # User | 
+query = 'query_example' # str | 
+
+try:
+ api_instance.test_body_with_query_params(body, query)
+except ApiException as e:
+ print("Exception when calling FakeApi->test_body_with_query_params: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**User**](User.md)| | 
+ **query** | **str**| | 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: Not defined
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 # **test_client_model**
 > Client test_client_model(body)
 
@@ -252,7 +299,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **test_endpoint_parameters**
-> test_endpoint_parameters(number, double, pattern_without_delimiter, byte, integer=integer, int32=int32, int64=int64, float=float, string=string, binary=binary, date=date, date_time=date_time, password=password, param_callback=param_callback)
+> test_endpoint_parameters(number, double, pattern_without_delimiter, byte, integer=integer, int32=int32, int64=int64, _float=_float, string=string, binary=binary, _date=_date, date_time=date_time, password=password, param_callback=param_callback)
 
 Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
 
@@ -280,17 +327,17 @@ byte = 'B' # str | None
 integer = 56 # int | None (optional)
 int32 = 56 # int | None (optional)
 int64 = 789 # int | None (optional)
-float = 3.4 # float | None (optional)
+_float = 3.4 # float | None (optional)
 string = 'string_example' # str | None (optional)
 binary = 'B' # str | None (optional)
-date = '2013-10-20' # date | None (optional)
+_date = '2013-10-20' # date | None (optional)
 date_time = '2013-10-20T19:20:30+01:00' # datetime | None (optional)
 password = 'password_example' # str | None (optional)
 param_callback = 'param_callback_example' # str | None (optional)
 
 try:
  # Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
- api_instance.test_endpoint_parameters(number, double, pattern_without_delimiter, byte, integer=integer, int32=int32, int64=int64, float=float, string=string, binary=binary, date=date, date_time=date_time, password=password, param_callback=param_callback)
+ api_instance.test_endpoint_parameters(number, double, pattern_without_delimiter, byte, integer=integer, int32=int32, int64=int64, _float=_float, string=string, binary=binary, _date=_date, date_time=date_time, password=password, param_callback=param_callback)
 except ApiException as e:
  print("Exception when calling FakeApi->test_endpoint_parameters: %s\n" % e)
 ```
@@ -306,10 +353,10 @@ Name | Type | Description | Notes
  **integer** | **int**| None | [optional] 
  **int32** | **int**| None | [optional] 
  **int64** | **int**| None | [optional] 
- **float** | **float**| None | [optional] 
+ **_float** | **float**| None | [optional] 
  **string** | **str**| None | [optional] 
  **binary** | **str**| None | [optional] 
- **date** | **date**| None | [optional] 
+ **_date** | **date**| None | [optional] 
  **date_time** | **datetime**| None | [optional] 
  **password** | **str**| None | [optional] 
  **param_callback** | **str**| None | [optional] 

samples/client/petstore/python-asyncio/docs/FormatTest.md

@@ -7,12 +7,12 @@ Name | Type | Description | Notes
 **int32** | **int** | | [optional] 
 **int64** | **int** | | [optional] 
 **number** | **float** | | 
-**float** | **float** | | [optional] 
+**_float** | **float** | | [optional] 
 **double** | **float** | | [optional] 
 **string** | **str** | | [optional] 
 **byte** | **str** | | 
 **binary** | **str** | | [optional] 
-**date** | **date** | | 
+**_date** | **date** | | 
 **date_time** | **datetime** | | [optional] 
 **uuid** | **str** | | [optional] 
 **password** | **str** | | 

samples/client/petstore/python-asyncio/petstore_api/api/another_fake_api.py

@@ -38,18 +38,18 @@ def test_special_tags(self, body, **kwargs): # noqa: E501
 
  To test special tags # noqa: E501
  This method makes a synchronous HTTP request by default. To make an
- asynchronous HTTP request, please pass async=True
- >>> thread = api.test_special_tags(body, async=True)
+ asynchronous HTTP request, please pass async_req=True
+ >>> thread = api.test_special_tags(body, async_req=True)
  >>> result = thread.get()
 
- :param async bool
+ :param async_req bool
  :param Client body: client model (required)
  :return: Client
  If the method is called asynchronously,
  returns the request thread.
  """
  kwargs['_return_http_data_only'] = True
- if kwargs.get('async'):
+ if kwargs.get('async_req'):
  return self.test_special_tags_with_http_info(body, **kwargs) # noqa: E501
  else:
  (data) = self.test_special_tags_with_http_info(body, **kwargs) # noqa: E501
@@ -60,19 +60,19 @@ def test_special_tags_with_http_info(self, body, **kwargs): # noqa: E501
 
  To test special tags # noqa: E501
  This method makes a synchronous HTTP request by default. To make an
- asynchronous HTTP request, please pass async=True
- >>> thread = api.test_special_tags_with_http_info(body, async=True)
+ asynchronous HTTP request, please pass async_req=True
+ >>> thread = api.test_special_tags_with_http_info(body, async_req=True)
  >>> result = thread.get()
 
- :param async bool
+ :param async_req bool
  :param Client body: client model (required)
  :return: Client
  If the method is called asynchronously,
  returns the request thread.
  """
 
  all_params = ['body'] # noqa: E501
- all_params.append('async')
+ all_params.append('async_req')
  all_params.append('_return_http_data_only')
  all_params.append('_preload_content')
  all_params.append('_request_timeout')
@@ -126,7 +126,7 @@ def test_special_tags_with_http_info(self, body, **kwargs): # noqa: E501
  files=local_var_files,
  response_type='Client', # noqa: E501
  auth_settings=auth_settings,
- async=params.get('async'),
+ async_req=params.get('async_req'),
  _return_http_data_only=params.get('_return_http_data_only'),
  _preload_content=params.get('_preload_content', True),
  _request_timeout=params.get('_request_timeout'),