loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

[python-flask] adopt python3.5+ syntax (#16375)

Browse Source 
* adopt python3.5+ syntax

removing some residual python2 code, since it is not supported anymore, like:
- no need for `six` anymore
- no need for encoding utf8 in top file
- remove `object` inheritance in base model
- remove absolute import `__future__`

* generate samples

applying the new templates

* update python ignore pattern

ignore all the `.venv` folders
This commit is contained in:
Anis 2023-08-23 04:42:40 +02:00 committed by GitHub
parent 646ec8ba41
commit 00de163655
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
28 changed files with 23 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.gitignore vendored
View File

@ -173,14 +173,13 @@ samples/client/petstore/csharp-refactor/OpenAPIClient/nuget.exe
# Python
*.pyc
__pycache__
.venv/
samples/client/petstore/python/dev-requirements.txt.log
samples/client/petstore/python/swagger_client.egg-info/SOURCES.txt
samples/client/petstore/python/.coverage
samples/client/petstore/python/.projectile
samples/client/petstore/python/.venv/
samples/client/petstore/python-asyncio/.venv/
samples/client/petstore/python-asyncio/.pytest_cache/
samples/client/petstore/python-tornado/.venv/
# PHP
samples/client/petstore/php/OpenAPIClient-php/composer.lock

3
modules/openapi-generator/src/main/resources/python-flask/__init__model.mustache vendored
View File

@ -1,7 +1,4 @@
# coding: utf-8
# flake8: noqa
from __future__ import absolute_import
# import models into model package
{{#models}}{{#model}}from {{modelPackage}}.{{classFilename}} import {{classname}}{{/model}}
{{/models}}

5
modules/openapi-generator/src/main/resources/python-flask/base_model.mustache vendored
View File

@ -1,6 +1,5 @@
import pprint
import six
import typing
from {{packageName}} import util
@ -8,7 +7,7 @@ from {{packageName}} import util
T = typing.TypeVar('T')
class Model(object):
class Model:
# openapiTypes: The key is attribute name and the
# value is attribute type.
openapi_types: typing.Dict[str, type] = {}
@ -29,7 +28,7 @@ class Model(object):
"""
result = {}
for attr, _ in six.iteritems(self.openapi_types):
for attr in self.openapi_types:
value = getattr(self, attr)
if isinstance(value, list):
result[attr] = list(map(

7
modules/openapi-generator/src/main/resources/python-flask/controller.mustache vendored
View File

@ -1,5 +1,4 @@
import connexion
import six
from typing import Dict
from typing import Tuple
from typing import Union
@ -97,15 +96,15 @@ def {{operationId}}({{#allParams}}{{paramName}}{{^required}}=None{{/required}}{{
{{#items}}
{{#isDate}}
if connexion.request.is_json:
{{paramName}} = {k: util.deserialize_date(v) for k, v in six.iteritems(connexion.request.get_json())} # noqa: E501
{{paramName}} = {k: util.deserialize_date(v) for k, v in connexion.request.get_json().items()} # noqa: E501
{{/isDate}}
{{#isDateTime}}
if connexion.request.is_json:
{{paramName}} = {k: util.deserialize_datetime(v) for k, v in six.iteritems(connexion.request.get_json())} # noqa: E501
{{paramName}} = {k: util.deserialize_datetime(v) for k, v in connexion.request.get_json().items()} # noqa: E501
{{/isDateTime}}
{{#complexType}}
if connexion.request.is_json:
{{paramName}} = {k: {{baseType}}.from_dict(v) for k, v in six.iteritems(connexion.request.get_json())} # noqa: E501
{{paramName}} = {k: {{baseType}}.from_dict(v) for k, v in connexion.request.get_json().items()} # noqa: E501
{{/complexType}}
{{/items}}
{{/isMap}}

4
modules/openapi-generator/src/main/resources/python-flask/controller_test.mustache vendored
View File

@ -1,10 +1,6 @@
# coding: utf-8
from __future__ import absolute_import
import unittest
from flask import json
from six import BytesIO
{{#imports}}{{import}} # noqa: E501
{{/imports}}

3
modules/openapi-generator/src/main/resources/python-flask/encoder.mustache vendored
View File

@ -1,5 +1,4 @@
from connexion.apps.flask_app import FlaskJSONEncoder
import six
from {{modelPackage}}.base_model import Model
@ -10,7 +9,7 @@ class JSONEncoder(FlaskJSONEncoder):
def default(self, o):
if isinstance(o, Model):
dikt = {}
for attr, _ in six.iteritems(o.openapi_types):
for attr in o.openapi_types:
value = getattr(o, attr)
if value is None and not self.include_nulls:
continue

3
modules/openapi-generator/src/main/resources/python-flask/model.mustache vendored
View File

@ -1,6 +1,3 @@
# coding: utf-8
from __future__ import absolute_import
from datetime import date, datetime # noqa: F401
from typing import List, Dict # noqa: F401

2
modules/openapi-generator/src/main/resources/python-flask/setup.mustache vendored
View File

@ -1,5 +1,3 @@
# coding: utf-8
import sys
from setuptools import setup, find_packages

2
modules/openapi-generator/src/main/resources/python-flask/typing_utils.mustache vendored
View File

@ -1,5 +1,3 @@
# coding: utf-8
import sys
if sys.version_info < (3, 7):

9
modules/openapi-generator/src/main/resources/python-flask/util.mustache vendored
View File

@ -1,6 +1,5 @@
import datetime
import six
import typing
from {{packageName}} import typing_utils
@ -16,7 +15,7 @@ def _deserialize(data, klass):
if data is None:
return None
if klass in six.integer_types or klass in (float, str, bool, bytearray):
if klass in (int, float, str, bool, bytearray):
return _deserialize_primitive(data, klass)
elif klass == object:
return _deserialize_object(data)
@ -45,7 +44,7 @@ def _deserialize_primitive(data, klass):
try:
value = klass(data)
except UnicodeEncodeError:
value = six.u(data)
value = data
except TypeError:
value = data
return value
@ -110,7 +109,7 @@ def deserialize_model(data, klass):
if not instance.openapi_types:
return data
for attr, attr_type in six.iteritems(instance.openapi_types):
for attr, attr_type in instance.openapi_types.items():
if data is not None \
and instance.attribute_map[attr] in data \
and isinstance(data, (list, dict)):
@ -145,4 +144,4 @@ def _deserialize_dict(data, boxed_type):
:rtype: dict
"""
return {k: _deserialize(v, boxed_type)
for k, v in six.iteritems(data)}
for k, v in data.items() }

1
samples/server/petstore/python-flask/openapi_server/controllers/pet_controller.py
View File

@ -1,5 +1,4 @@
import connexion
import six
from typing import Dict
from typing import Tuple
from typing import Union

1
samples/server/petstore/python-flask/openapi_server/controllers/store_controller.py
View File

@ -1,5 +1,4 @@
import connexion
import six
from typing import Dict
from typing import Tuple
from typing import Union

1
samples/server/petstore/python-flask/openapi_server/controllers/user_controller.py
View File

@ -1,5 +1,4 @@
import connexion
import six
from typing import Dict
from typing import Tuple
from typing import Union

3
samples/server/petstore/python-flask/openapi_server/encoder.py
View File

@ -1,5 +1,4 @@
from connexion.apps.flask_app import FlaskJSONEncoder
import six
from openapi_server.models.base_model import Model
@ -10,7 +9,7 @@ class JSONEncoder(FlaskJSONEncoder):
def default(self, o):
if isinstance(o, Model):
dikt = {}
for attr, _ in six.iteritems(o.openapi_types):
for attr in o.openapi_types:
value = getattr(o, attr)
if value is None and not self.include_nulls:
continue

3
samples/server/petstore/python-flask/openapi_server/models/__init__.py
View File

@ -1,7 +1,4 @@
# coding: utf-8
# flake8: noqa
from __future__ import absolute_import
# import models into model package
from openapi_server.models.api_response import ApiResponse
from openapi_server.models.category import Category

3
samples/server/petstore/python-flask/openapi_server/models/api_response.py
View File

@ -1,6 +1,3 @@
# coding: utf-8
from __future__ import absolute_import
from datetime import date, datetime # noqa: F401
from typing import List, Dict # noqa: F401

5
samples/server/petstore/python-flask/openapi_server/models/base_model.py
View File

@ -1,6 +1,5 @@
import pprint
import six
import typing
from openapi_server import util
@ -8,7 +7,7 @@ from openapi_server import util
T = typing.TypeVar('T')
class Model(object):
class Model:
# openapiTypes: The key is attribute name and the
# value is attribute type.
openapi_types: typing.Dict[str, type] = {}
@ -29,7 +28,7 @@ class Model(object):
"""
result = {}
for attr, _ in six.iteritems(self.openapi_types):
for attr in self.openapi_types:
value = getattr(self, attr)
if isinstance(value, list):
result[attr] = list(map(

3
samples/server/petstore/python-flask/openapi_server/models/category.py
View File

@ -1,6 +1,3 @@
# coding: utf-8
from __future__ import absolute_import
from datetime import date, datetime # noqa: F401
from typing import List, Dict # noqa: F401

3
samples/server/petstore/python-flask/openapi_server/models/order.py
View File

@ -1,6 +1,3 @@
# coding: utf-8
from __future__ import absolute_import
from datetime import date, datetime # noqa: F401
from typing import List, Dict # noqa: F401

3
samples/server/petstore/python-flask/openapi_server/models/pet.py
View File

@ -1,6 +1,3 @@
# coding: utf-8
from __future__ import absolute_import
from datetime import date, datetime # noqa: F401
from typing import List, Dict # noqa: F401

3
samples/server/petstore/python-flask/openapi_server/models/tag.py
View File

@ -1,6 +1,3 @@
# coding: utf-8
from __future__ import absolute_import
from datetime import date, datetime # noqa: F401
from typing import List, Dict # noqa: F401

3
samples/server/petstore/python-flask/openapi_server/models/user.py
View File

@ -1,6 +1,3 @@
# coding: utf-8
from __future__ import absolute_import
from datetime import date, datetime # noqa: F401
from typing import List, Dict # noqa: F401

42
samples/server/petstore/python-flask/openapi_server/test/test_pet_controller.py
View File

@ -1,10 +1,6 @@
# coding: utf-8
from __future__ import absolute_import
import unittest
from flask import json
from six import BytesIO
from openapi_server.models.api_response import ApiResponse # noqa: E501
from openapi_server.models.pet import Pet # noqa: E501
@ -20,23 +16,7 @@ class TestPetController(BaseTestCase):
Add a new pet to the store
"""
body = {
"photoUrls" : [ "photoUrls", "photoUrls" ],
"name" : "doggie",
"id" : 0,
"category" : {
"name" : "name",
"id" : 6
},
"tags" : [ {
"name" : "name",
"id" : 1
}, {
"name" : "name",
"id" : 1
} ],
"status" : "available"
}
body = {"photoUrls":["photoUrls","photoUrls"],"name":"doggie","id":0,"category":{"name":"name","id":6},"tags":[{"name":"name","id":1},{"name":"name","id":1}],"status":"available"}
headers = {
'Content-Type': 'application/json',
'Authorization': 'Bearer special-key',
@ -71,7 +51,7 @@ class TestPetController(BaseTestCase):
Finds Pets by status
"""
query_string = [('status', 'available')]
query_string = [('status', ['status_example'])]
headers = {
'Accept': 'application/json',
'Authorization': 'Bearer special-key',
@ -124,23 +104,7 @@ class TestPetController(BaseTestCase):
Update an existing pet
"""
body = {
"photoUrls" : [ "photoUrls", "photoUrls" ],
"name" : "doggie",
"id" : 0,
"category" : {
"name" : "name",
"id" : 6
},
"tags" : [ {
"name" : "name",
"id" : 1
}, {
"name" : "name",
"id" : 1
} ],
"status" : "available"
}
body = {"photoUrls":["photoUrls","photoUrls"],"name":"doggie","id":0,"category":{"name":"name","id":6},"tags":[{"name":"name","id":1},{"name":"name","id":1}],"status":"available"}
headers = {
'Content-Type': 'application/json',
'Authorization': 'Bearer special-key',

6
samples/server/petstore/python-flask/openapi_server/test/test_store_controller.py
View File

@ -1,10 +1,6 @@
# coding: utf-8
from __future__ import absolute_import
import unittest
from flask import json
from six import BytesIO
from openapi_server.models.order import Order # noqa: E501
from openapi_server.test import BaseTestCase
@ -52,7 +48,7 @@ class TestStoreController(BaseTestCase):
'Accept': 'application/json',
}
response = self.client.open(
'/v2/store/order/{order_id}'.format(order_id=1),
'/v2/store/order/{order_id}'.format(order_id=56),
method='GET',
headers=headers)
self.assert200(response,

4
samples/server/petstore/python-flask/openapi_server/test/test_user_controller.py
View File

@ -1,10 +1,6 @@
# coding: utf-8
from __future__ import absolute_import
import unittest
from flask import json
from six import BytesIO
from openapi_server.models.user import User # noqa: E501
from openapi_server.test import BaseTestCase

2
samples/server/petstore/python-flask/openapi_server/typing_utils.py
View File

@ -1,5 +1,3 @@
# coding: utf-8
import sys
if sys.version_info < (3, 7):

9
samples/server/petstore/python-flask/openapi_server/util.py
View File

@ -1,6 +1,5 @@
import datetime
import six
import typing
from openapi_server import typing_utils
@ -16,7 +15,7 @@ def _deserialize(data, klass):
if data is None:
return None
if klass in six.integer_types or klass in (float, str, bool, bytearray):
if klass in (int, float, str, bool, bytearray):
return _deserialize_primitive(data, klass)
elif klass == object:
return _deserialize_object(data)
@ -45,7 +44,7 @@ def _deserialize_primitive(data, klass):
try:
value = klass(data)
except UnicodeEncodeError:
value = six.u(data)
value = data
except TypeError:
value = data
return value
@ -110,7 +109,7 @@ def deserialize_model(data, klass):
if not instance.openapi_types:
return data
for attr, attr_type in six.iteritems(instance.openapi_types):
for attr, attr_type in instance.openapi_types.items():
if data is not None \
and instance.attribute_map[attr] in data \
and isinstance(data, (list, dict)):
@ -145,4 +144,4 @@ def _deserialize_dict(data, boxed_type):
:rtype: dict
"""
return {k: _deserialize(v, boxed_type)
for k, v in six.iteritems(data)}
for k, v in data.items() }

2
samples/server/petstore/python-flask/setup.py
View File

@ -1,5 +1,3 @@
# coding: utf-8
import sys
from setuptools import setup, find_packages