feat: [python/asyncio] use ssl argument instead of ssl_context (deprecated from aiohttp>=3.0.0) (#1724)

2018-12-21 02:52:27 +01:00 · 2018-12-21 02:52:27 +01:00 · 89a0ffa66c
commit 89a0ffa66c
parent d38b9e588b
20 changed files with 11 additions and 29 deletions
--- a/modules/openapi-generator/src/main/resources/python/asyncio/rest.mustache
+++ b/modules/openapi-generator/src/main/resources/python/asyncio/rest.mustache
@ -58,7 +58,7 @@ class RESTClientObject(object):

        connector = aiohttp.TCPConnector(
            limit=maxsize,
-            ssl_context=ssl_context
+            ssl=ssl_context
        )

        # https pool manager
--- a/modules/openapi-generator/src/main/resources/python/setup.mustache
+++ b/modules/openapi-generator/src/main/resources/python/setup.mustache
@ -18,7 +18,7 @@ VERSION = "{{packageVersion}}"

 REQUIRES = ["urllib3 >= 1.15", "six >= 1.10", "certifi", "python-dateutil"]
 {{#asyncio}}
-REQUIRES.append("aiohttp")
+REQUIRES.append("aiohttp >= 3.0.0")
 {{/asyncio}}
 {{#tornado}}
 REQUIRES.append("tornado>=4.2,<5")
--- a/samples/client/petstore/python-asyncio/.openapi-generator/VERSION
+++ b/samples/client/petstore/python-asyncio/.openapi-generator/VERSION
@ -1 +1 @@
-4.0.0-SNAPSHOT
+4.0.0-SNAPSHOT
--- a/samples/client/petstore/python-asyncio/README.md
+++ b/samples/client/petstore/python-asyncio/README.md
@ -111,7 +111,6 @@ Class | Method | HTTP request | Description

 - [AdditionalPropertiesClass](docs/AdditionalPropertiesClass.md)
 - [Animal](docs/Animal.md)
- - [AnimalFarm](docs/AnimalFarm.md)
 - [ApiResponse](docs/ApiResponse.md)
 - [ArrayOfArrayOfNumberOnly](docs/ArrayOfArrayOfNumberOnly.md)
 - [ArrayOfNumberOnly](docs/ArrayOfNumberOnly.md)
@ -142,7 +141,6 @@ Class | Method | HTTP request | Description
 - [Pet](docs/Pet.md)
 - [ReadOnlyFirst](docs/ReadOnlyFirst.md)
 - [SpecialModelName](docs/SpecialModelName.md)
- - [StringBooleanMap](docs/StringBooleanMap.md)
 - [Tag](docs/Tag.md)
 - [User](docs/User.md)

--- a/samples/client/petstore/python-asyncio/petstore_api/init.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/init.py
@ -30,7 +30,6 @@ from petstore_api.configuration import Configuration
 # import models into sdk package
 from petstore_api.models.additional_properties_class import AdditionalPropertiesClass
 from petstore_api.models.animal import Animal
-from petstore_api.models.animal_farm import AnimalFarm
 from petstore_api.models.api_response import ApiResponse
 from petstore_api.models.array_of_array_of_number_only import ArrayOfArrayOfNumberOnly
 from petstore_api.models.array_of_number_only import ArrayOfNumberOnly
@ -61,6 +60,5 @@ from petstore_api.models.outer_enum import OuterEnum
 from petstore_api.models.pet import Pet
 from petstore_api.models.read_only_first import ReadOnlyFirst
 from petstore_api.models.special_model_name import SpecialModelName
-from petstore_api.models.string_boolean_map import StringBooleanMap
 from petstore_api.models.tag import Tag
 from petstore_api.models.user import User
--- a/samples/client/petstore/python-asyncio/petstore_api/api_client.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/api_client.py
@ -63,7 +63,7 @@ class ApiClient(object):
    _pool = None

    def __init__(self, configuration=None, header_name=None, header_value=None,
-                 cookie=None, pool_threads=None):
+                 cookie=None, pool_threads=1):
        if configuration is None:
            configuration = Configuration()
        self.configuration = configuration
--- a/samples/client/petstore/python-asyncio/petstore_api/models/init.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/init.py
@ -16,7 +16,6 @@ from __future__ import absolute_import
 # import models into model package
 from petstore_api.models.additional_properties_class import AdditionalPropertiesClass
 from petstore_api.models.animal import Animal
-from petstore_api.models.animal_farm import AnimalFarm
 from petstore_api.models.api_response import ApiResponse
 from petstore_api.models.array_of_array_of_number_only import ArrayOfArrayOfNumberOnly
 from petstore_api.models.array_of_number_only import ArrayOfNumberOnly
@ -47,6 +46,5 @@ from petstore_api.models.outer_enum import OuterEnum
 from petstore_api.models.pet import Pet
 from petstore_api.models.read_only_first import ReadOnlyFirst
 from petstore_api.models.special_model_name import SpecialModelName
-from petstore_api.models.string_boolean_map import StringBooleanMap
 from petstore_api.models.tag import Tag
 from petstore_api.models.user import User
--- a/samples/client/petstore/python-asyncio/petstore_api/rest.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/rest.py
@ -66,7 +66,7 @@ class RESTClientObject(object):

        connector = aiohttp.TCPConnector(
            limit=maxsize,
-            ssl_context=ssl_context
+            ssl=ssl_context
        )

        # https pool manager
--- a/samples/client/petstore/python-asyncio/setup.py
+++ b/samples/client/petstore/python-asyncio/setup.py
@ -22,7 +22,7 @@ VERSION = "1.0.0"
 # http://pypi.python.org/pypi/setuptools

 REQUIRES = ["urllib3 >= 1.15", "six >= 1.10", "certifi", "python-dateutil"]
-REQUIRES.append("aiohttp")
+REQUIRES.append("aiohttp >= 3.0.0")

 setup(
    name=NAME,
--- a/samples/client/petstore/python-asyncio/test_python3.sh
+++ b/samples/client/petstore/python-asyncio/test_python3.sh
@ -11,7 +11,7 @@ export LANG=en_US.UTF-8

 ### set virtualenv
 if [ -z "$VIRTUAL_ENV" ]; then
-		virtualenv $VENV --no-site-packages --always-copy --python python3
+		virtualenv $VENV --no-site-packages --always-copy --python python3.6
 		source $VENV/bin/activate
    DEACTIVE=true
 fi
--- a/samples/client/petstore/python-tornado/.openapi-generator/VERSION
+++ b/samples/client/petstore/python-tornado/.openapi-generator/VERSION
@ -1 +1 @@
-4.0.0-SNAPSHOT
+4.0.0-SNAPSHOT
--- a/samples/client/petstore/python-tornado/README.md
+++ b/samples/client/petstore/python-tornado/README.md
@ -111,7 +111,6 @@ Class | Method | HTTP request | Description

 - [AdditionalPropertiesClass](docs/AdditionalPropertiesClass.md)
 - [Animal](docs/Animal.md)
- - [AnimalFarm](docs/AnimalFarm.md)
 - [ApiResponse](docs/ApiResponse.md)
 - [ArrayOfArrayOfNumberOnly](docs/ArrayOfArrayOfNumberOnly.md)
 - [ArrayOfNumberOnly](docs/ArrayOfNumberOnly.md)
@ -142,7 +141,6 @@ Class | Method | HTTP request | Description
 - [Pet](docs/Pet.md)
 - [ReadOnlyFirst](docs/ReadOnlyFirst.md)
 - [SpecialModelName](docs/SpecialModelName.md)
- - [StringBooleanMap](docs/StringBooleanMap.md)
 - [Tag](docs/Tag.md)
 - [User](docs/User.md)

--- a/samples/client/petstore/python-tornado/petstore_api/init.py
+++ b/samples/client/petstore/python-tornado/petstore_api/init.py
@ -30,7 +30,6 @@ from petstore_api.configuration import Configuration
 # import models into sdk package
 from petstore_api.models.additional_properties_class import AdditionalPropertiesClass
 from petstore_api.models.animal import Animal
-from petstore_api.models.animal_farm import AnimalFarm
 from petstore_api.models.api_response import ApiResponse
 from petstore_api.models.array_of_array_of_number_only import ArrayOfArrayOfNumberOnly
 from petstore_api.models.array_of_number_only import ArrayOfNumberOnly
@ -61,6 +60,5 @@ from petstore_api.models.outer_enum import OuterEnum
 from petstore_api.models.pet import Pet
 from petstore_api.models.read_only_first import ReadOnlyFirst
 from petstore_api.models.special_model_name import SpecialModelName
-from petstore_api.models.string_boolean_map import StringBooleanMap
 from petstore_api.models.tag import Tag
 from petstore_api.models.user import User
--- a/samples/client/petstore/python-tornado/petstore_api/api_client.py
+++ b/samples/client/petstore/python-tornado/petstore_api/api_client.py
@ -64,7 +64,7 @@ class ApiClient(object):
    _pool = None

    def __init__(self, configuration=None, header_name=None, header_value=None,
-                 cookie=None, pool_threads=None):
+                 cookie=None, pool_threads=1):
        if configuration is None:
            configuration = Configuration()
        self.configuration = configuration
--- a/samples/client/petstore/python-tornado/petstore_api/models/init.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/init.py
@ -16,7 +16,6 @@ from __future__ import absolute_import
 # import models into model package
 from petstore_api.models.additional_properties_class import AdditionalPropertiesClass
 from petstore_api.models.animal import Animal
-from petstore_api.models.animal_farm import AnimalFarm
 from petstore_api.models.api_response import ApiResponse
 from petstore_api.models.array_of_array_of_number_only import ArrayOfArrayOfNumberOnly
 from petstore_api.models.array_of_number_only import ArrayOfNumberOnly
@ -47,6 +46,5 @@ from petstore_api.models.outer_enum import OuterEnum
 from petstore_api.models.pet import Pet
 from petstore_api.models.read_only_first import ReadOnlyFirst
 from petstore_api.models.special_model_name import SpecialModelName
-from petstore_api.models.string_boolean_map import StringBooleanMap
 from petstore_api.models.tag import Tag
 from petstore_api.models.user import User
--- a/samples/client/petstore/python/.openapi-generator/VERSION
+++ b/samples/client/petstore/python/.openapi-generator/VERSION
@ -1 +1 @@
-4.0.0-SNAPSHOT
+4.0.0-SNAPSHOT
--- a/samples/client/petstore/python/README.md
+++ b/samples/client/petstore/python/README.md
@ -111,7 +111,6 @@ Class | Method | HTTP request | Description

 - [AdditionalPropertiesClass](docs/AdditionalPropertiesClass.md)
 - [Animal](docs/Animal.md)
- - [AnimalFarm](docs/AnimalFarm.md)
 - [ApiResponse](docs/ApiResponse.md)
 - [ArrayOfArrayOfNumberOnly](docs/ArrayOfArrayOfNumberOnly.md)
 - [ArrayOfNumberOnly](docs/ArrayOfNumberOnly.md)
@ -142,7 +141,6 @@ Class | Method | HTTP request | Description
 - [Pet](docs/Pet.md)
 - [ReadOnlyFirst](docs/ReadOnlyFirst.md)
 - [SpecialModelName](docs/SpecialModelName.md)
- - [StringBooleanMap](docs/StringBooleanMap.md)
 - [Tag](docs/Tag.md)
 - [User](docs/User.md)

--- a/samples/client/petstore/python/petstore_api/init.py
+++ b/samples/client/petstore/python/petstore_api/init.py
@ -30,7 +30,6 @@ from petstore_api.configuration import Configuration
 # import models into sdk package
 from petstore_api.models.additional_properties_class import AdditionalPropertiesClass
 from petstore_api.models.animal import Animal
-from petstore_api.models.animal_farm import AnimalFarm
 from petstore_api.models.api_response import ApiResponse
 from petstore_api.models.array_of_array_of_number_only import ArrayOfArrayOfNumberOnly
 from petstore_api.models.array_of_number_only import ArrayOfNumberOnly
@ -61,6 +60,5 @@ from petstore_api.models.outer_enum import OuterEnum
 from petstore_api.models.pet import Pet
 from petstore_api.models.read_only_first import ReadOnlyFirst
 from petstore_api.models.special_model_name import SpecialModelName
-from petstore_api.models.string_boolean_map import StringBooleanMap
 from petstore_api.models.tag import Tag
 from petstore_api.models.user import User
--- a/samples/client/petstore/python/petstore_api/api_client.py
+++ b/samples/client/petstore/python/petstore_api/api_client.py
@ -63,7 +63,7 @@ class ApiClient(object):
    _pool = None

    def __init__(self, configuration=None, header_name=None, header_value=None,
-                 cookie=None, pool_threads=None):
+                 cookie=None, pool_threads=1):
        if configuration is None:
            configuration = Configuration()
        self.configuration = configuration
--- a/samples/client/petstore/python/petstore_api/models/init.py
+++ b/samples/client/petstore/python/petstore_api/models/init.py
@ -16,7 +16,6 @@ from __future__ import absolute_import
 # import models into model package
 from petstore_api.models.additional_properties_class import AdditionalPropertiesClass
 from petstore_api.models.animal import Animal
-from petstore_api.models.animal_farm import AnimalFarm
 from petstore_api.models.api_response import ApiResponse
 from petstore_api.models.array_of_array_of_number_only import ArrayOfArrayOfNumberOnly
 from petstore_api.models.array_of_number_only import ArrayOfNumberOnly
@ -47,6 +46,5 @@ from petstore_api.models.outer_enum import OuterEnum
 from petstore_api.models.pet import Pet
 from petstore_api.models.read_only_first import ReadOnlyFirst
 from petstore_api.models.special_model_name import SpecialModelName
-from petstore_api.models.string_boolean_map import StringBooleanMap
 from petstore_api.models.tag import Tag
 from petstore_api.models.user import User