From cd8e718a8f98d25139775a0ecd6039f04fa40968 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Wed, 27 Sep 2023 10:48:47 +0300
Subject: [PATCH] python: Remove usage of six

---
 .../app/{{packageName}}/controllers/controller.mustache  | 7 +++----
 .../app/{{packageName}}/encoder.mustache                 | 3 +--
 .../app/{{packageName}}/models/base_model.mustache       | 3 +--
 .../app/{{packageName}}/test/controller_test.mustache    | 2 +-
 .../python-blueplanet/app/{{packageName}}/util.mustache  | 9 ++++-----
 .../main/resources/python-fastapi/requirements.mustache  | 1 -
 .../petstore_api/api/fake_classname_tags_123_api.py      | 5 +----
 .../python-pydantic-v1/tests/test_api_exception.py       | 1 -
 .../python-pydantic-v1/tests/test_api_validation.py      | 1 -
 .../petstore_api/api/fake_classname_tags_123_api.py      | 5 +----
 .../client/petstore/python/tests/test_api_exception.py   | 1 -
 .../client/petstore/python/tests/test_api_validation.py  | 1 -
 .../openapi_server/controllers/pet_controller.py         | 1 -
 .../openapi_server/controllers/store_controller.py       | 1 -
 .../openapi_server/controllers/user_controller.py        | 1 -
 .../petstore/python-flask/openapi_server/encoder.py      | 3 +--
 .../python-flask/openapi_server/models/base_model.py     | 3 +--
 .../openapi_server/test/test_pet_controller.py           | 2 +-
 .../openapi_server/test/test_store_controller.py         | 2 +-
 .../openapi_server/test/test_user_controller.py          | 2 +-
 .../server/petstore/python-flask/openapi_server/util.py  | 9 ++++-----
 .../app/openapi_server/controllers/pet_controller.py     | 1 -
 .../app/openapi_server/controllers/store_controller.py   | 1 -
 .../app/openapi_server/controllers/user_controller.py    | 1 -
 .../python-blueplanet/app/openapi_server/encoder.py      | 3 +--
 .../app/openapi_server/models/base_model.py              | 3 +--
 .../app/openapi_server/test/test_pet_controller.py       | 2 +-
 .../app/openapi_server/test/test_store_controller.py     | 2 +-
 .../app/openapi_server/test/test_user_controller.py      | 2 +-
 .../python-blueplanet/app/openapi_server/util.py         | 9 ++++-----
 samples/server/petstore/python-fastapi/requirements.txt  | 1 -
 31 files changed, 30 insertions(+), 58 deletions(-)

diff --git a/modules/openapi-generator/src/main/resources/python-blueplanet/app/{{packageName}}/controllers/controller.mustache b/modules/openapi-generator/src/main/resources/python-blueplanet/app/{{packageName}}/controllers/controller.mustache
index 6f026a0602f2..afba1f7cfefb 100644
--- a/modules/openapi-generator/src/main/resources/python-blueplanet/app/{{packageName}}/controllers/controller.mustache
+++ b/modules/openapi-generator/src/main/resources/python-blueplanet/app/{{packageName}}/controllers/controller.mustache
@@ -1,5 +1,4 @@
 import connexion
-import six
 
 {{#imports}}{{import}}  # noqa: E501
 {{/imports}}
@@ -94,15 +93,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}}
diff --git a/modules/openapi-generator/src/main/resources/python-blueplanet/app/{{packageName}}/encoder.mustache b/modules/openapi-generator/src/main/resources/python-blueplanet/app/{{packageName}}/encoder.mustache
index 0681e63c126f..bdb5fced9f23 100644
--- a/modules/openapi-generator/src/main/resources/python-blueplanet/app/{{packageName}}/encoder.mustache
+++ b/modules/openapi-generator/src/main/resources/python-blueplanet/app/{{packageName}}/encoder.mustache
@@ -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.swagger_types):
+            for attr in o.swagger_types:
                 value = getattr(o, attr)
                 if value is None and not self.include_nulls:
                     continue
diff --git a/modules/openapi-generator/src/main/resources/python-blueplanet/app/{{packageName}}/models/base_model.mustache b/modules/openapi-generator/src/main/resources/python-blueplanet/app/{{packageName}}/models/base_model.mustache
index 888fa9896461..07a5e26b5b09 100644
--- a/modules/openapi-generator/src/main/resources/python-blueplanet/app/{{packageName}}/models/base_model.mustache
+++ b/modules/openapi-generator/src/main/resources/python-blueplanet/app/{{packageName}}/models/base_model.mustache
@@ -1,6 +1,5 @@
 import pprint
 
-import six
 import typing
 
 from {{packageName}} import util
@@ -29,7 +28,7 @@ class Model(object):
         """
         result = {}
 
-        for attr, _ in six.iteritems(self.swagger_types):
+        for attr in self.swagger_types:
             value = getattr(self, attr)
             if isinstance(value, list):
                 result[attr] = list(map(
diff --git a/modules/openapi-generator/src/main/resources/python-blueplanet/app/{{packageName}}/test/controller_test.mustache b/modules/openapi-generator/src/main/resources/python-blueplanet/app/{{packageName}}/test/controller_test.mustache
index 5bf4d008fe77..b9a5ea4eb95a 100644
--- a/modules/openapi-generator/src/main/resources/python-blueplanet/app/{{packageName}}/test/controller_test.mustache
+++ b/modules/openapi-generator/src/main/resources/python-blueplanet/app/{{packageName}}/test/controller_test.mustache
@@ -3,7 +3,7 @@
 from __future__ import absolute_import
 
 from flask import json
-from six import BytesIO
+from io import BytesIO
 
 {{#imports}}{{import}}  # noqa: E501
 {{/imports}}
diff --git a/modules/openapi-generator/src/main/resources/python-blueplanet/app/{{packageName}}/util.mustache b/modules/openapi-generator/src/main/resources/python-blueplanet/app/{{packageName}}/util.mustache
index 9763c8fc8500..4abe301b45ad 100644
--- a/modules/openapi-generator/src/main/resources/python-blueplanet/app/{{packageName}}/util.mustache
+++ b/modules/openapi-generator/src/main/resources/python-blueplanet/app/{{packageName}}/util.mustache
@@ -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):
+    if klass == int or klass in (float, str, bool):
         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 = str(data)
     except TypeError:
         value = data
     return value
@@ -104,7 +103,7 @@ def deserialize_model(data, klass):
     if not instance.swagger_types:
         return data
 
-    for attr, attr_type in six.iteritems(instance.swagger_types):
+    for attr, attr_type in instance.swagger_types.items():
         if data is not None \
                 and instance.attribute_map[attr] in data \
                 and isinstance(data, (list, dict)):
@@ -139,4 +138,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()}
diff --git a/modules/openapi-generator/src/main/resources/python-fastapi/requirements.mustache b/modules/openapi-generator/src/main/resources/python-fastapi/requirements.mustache
index e5a1b375c4c3..10b044e70c91 100644
--- a/modules/openapi-generator/src/main/resources/python-fastapi/requirements.mustache
+++ b/modules/openapi-generator/src/main/resources/python-fastapi/requirements.mustache
@@ -26,7 +26,6 @@ python-multipart==0.0.5
 PyYAML==5.4.1
 requests==2.25.1
 Rx==1.6.1
-six==1.16.0
 starlette==0.27.0
 typing-extensions==3.10.0.0
 ujson==4.0.2
diff --git a/samples/openapi3/client/petstore/python-pydantic-v1/petstore_api/api/fake_classname_tags_123_api.py b/samples/openapi3/client/petstore/python-pydantic-v1/petstore_api/api/fake_classname_tags_123_api.py
index 05c1c8a0e4ff..c4d582464d68 100755
--- a/samples/openapi3/client/petstore/python-pydantic-v1/petstore_api/api/fake_classname_tags_123_api.py
+++ b/samples/openapi3/client/petstore/python-pydantic-v1/petstore_api/api/fake_classname_tags_123_api.py
@@ -14,9 +14,6 @@
 
 import re  # noqa: F401
 
-# python 2 and python 3 compatibility library
-import six
-
 from petstore_api.api_client import ApiClient
 from petstore_api.exceptions import (  # noqa: F401
     ApiTypeError,
@@ -119,7 +116,7 @@ def test_classname_with_http_info(self, client, **kwargs):  # noqa: E501
             ]
         )
 
-        for key, val in six.iteritems(local_var_params['kwargs']):
+        for key, val in local_var_params['kwargs'].items():
             if key not in all_params:
                 raise ApiTypeError(
                     "Got an unexpected keyword argument '%s'"
diff --git a/samples/openapi3/client/petstore/python-pydantic-v1/tests/test_api_exception.py b/samples/openapi3/client/petstore/python-pydantic-v1/tests/test_api_exception.py
index 73915b0d5fca..eb8f12293ed4 100644
--- a/samples/openapi3/client/petstore/python-pydantic-v1/tests/test_api_exception.py
+++ b/samples/openapi3/client/petstore/python-pydantic-v1/tests/test_api_exception.py
@@ -10,7 +10,6 @@
 """
 
 import os
-import six
 import sys
 import unittest
 
diff --git a/samples/openapi3/client/petstore/python-pydantic-v1/tests/test_api_validation.py b/samples/openapi3/client/petstore/python-pydantic-v1/tests/test_api_validation.py
index dc7da96329c0..c791384d92ff 100644
--- a/samples/openapi3/client/petstore/python-pydantic-v1/tests/test_api_validation.py
+++ b/samples/openapi3/client/petstore/python-pydantic-v1/tests/test_api_validation.py
@@ -10,7 +10,6 @@
 """
 
 import os
-import six
 import sys
 import unittest
 
diff --git a/samples/openapi3/client/petstore/python/petstore_api/api/fake_classname_tags_123_api.py b/samples/openapi3/client/petstore/python/petstore_api/api/fake_classname_tags_123_api.py
index 05c1c8a0e4ff..c4d582464d68 100755
--- a/samples/openapi3/client/petstore/python/petstore_api/api/fake_classname_tags_123_api.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/api/fake_classname_tags_123_api.py
@@ -14,9 +14,6 @@
 
 import re  # noqa: F401
 
-# python 2 and python 3 compatibility library
-import six
-
 from petstore_api.api_client import ApiClient
 from petstore_api.exceptions import (  # noqa: F401
     ApiTypeError,
@@ -119,7 +116,7 @@ def test_classname_with_http_info(self, client, **kwargs):  # noqa: E501
             ]
         )
 
-        for key, val in six.iteritems(local_var_params['kwargs']):
+        for key, val in local_var_params['kwargs'].items():
             if key not in all_params:
                 raise ApiTypeError(
                     "Got an unexpected keyword argument '%s'"
diff --git a/samples/openapi3/client/petstore/python/tests/test_api_exception.py b/samples/openapi3/client/petstore/python/tests/test_api_exception.py
index 73915b0d5fca..eb8f12293ed4 100644
--- a/samples/openapi3/client/petstore/python/tests/test_api_exception.py
+++ b/samples/openapi3/client/petstore/python/tests/test_api_exception.py
@@ -10,7 +10,6 @@
 """
 
 import os
-import six
 import sys
 import unittest
 
diff --git a/samples/openapi3/client/petstore/python/tests/test_api_validation.py b/samples/openapi3/client/petstore/python/tests/test_api_validation.py
index dc7da96329c0..c791384d92ff 100644
--- a/samples/openapi3/client/petstore/python/tests/test_api_validation.py
+++ b/samples/openapi3/client/petstore/python/tests/test_api_validation.py
@@ -10,7 +10,6 @@
 """
 
 import os
-import six
 import sys
 import unittest
 
diff --git a/samples/openapi3/server/petstore/python-flask/openapi_server/controllers/pet_controller.py b/samples/openapi3/server/petstore/python-flask/openapi_server/controllers/pet_controller.py
index d2a440eae16a..099f6fcadb9a 100644
--- a/samples/openapi3/server/petstore/python-flask/openapi_server/controllers/pet_controller.py
+++ b/samples/openapi3/server/petstore/python-flask/openapi_server/controllers/pet_controller.py
@@ -1,5 +1,4 @@
 import connexion
-import six
 from typing import Dict
 from typing import Tuple
 from typing import Union
diff --git a/samples/openapi3/server/petstore/python-flask/openapi_server/controllers/store_controller.py b/samples/openapi3/server/petstore/python-flask/openapi_server/controllers/store_controller.py
index 79340691c03e..1782980a90a1 100644
--- a/samples/openapi3/server/petstore/python-flask/openapi_server/controllers/store_controller.py
+++ b/samples/openapi3/server/petstore/python-flask/openapi_server/controllers/store_controller.py
@@ -1,5 +1,4 @@
 import connexion
-import six
 from typing import Dict
 from typing import Tuple
 from typing import Union
diff --git a/samples/openapi3/server/petstore/python-flask/openapi_server/controllers/user_controller.py b/samples/openapi3/server/petstore/python-flask/openapi_server/controllers/user_controller.py
index 1187dcf862d5..67646174789d 100644
--- a/samples/openapi3/server/petstore/python-flask/openapi_server/controllers/user_controller.py
+++ b/samples/openapi3/server/petstore/python-flask/openapi_server/controllers/user_controller.py
@@ -1,5 +1,4 @@
 import connexion
-import six
 from typing import Dict
 from typing import Tuple
 from typing import Union
diff --git a/samples/openapi3/server/petstore/python-flask/openapi_server/encoder.py b/samples/openapi3/server/petstore/python-flask/openapi_server/encoder.py
index 1ec9cb99b838..60f4fa67e7dc 100644
--- a/samples/openapi3/server/petstore/python-flask/openapi_server/encoder.py
+++ b/samples/openapi3/server/petstore/python-flask/openapi_server/encoder.py
@@ -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
diff --git a/samples/openapi3/server/petstore/python-flask/openapi_server/models/base_model.py b/samples/openapi3/server/petstore/python-flask/openapi_server/models/base_model.py
index 916e582ec27f..2f04ec6ff713 100644
--- a/samples/openapi3/server/petstore/python-flask/openapi_server/models/base_model.py
+++ b/samples/openapi3/server/petstore/python-flask/openapi_server/models/base_model.py
@@ -1,6 +1,5 @@
 import pprint
 
-import six
 import typing
 
 from openapi_server import util
@@ -29,7 +28,7 @@ def to_dict(self):
         """
         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(
diff --git a/samples/openapi3/server/petstore/python-flask/openapi_server/test/test_pet_controller.py b/samples/openapi3/server/petstore/python-flask/openapi_server/test/test_pet_controller.py
index a51734729375..9e7923d205f5 100644
--- a/samples/openapi3/server/petstore/python-flask/openapi_server/test/test_pet_controller.py
+++ b/samples/openapi3/server/petstore/python-flask/openapi_server/test/test_pet_controller.py
@@ -4,7 +4,7 @@
 import unittest
 
 from flask import json
-from six import BytesIO
+from io import BytesIO
 
 from openapi_server.models.api_response import ApiResponse  # noqa: E501
 from openapi_server.models.pet import Pet  # noqa: E501
diff --git a/samples/openapi3/server/petstore/python-flask/openapi_server/test/test_store_controller.py b/samples/openapi3/server/petstore/python-flask/openapi_server/test/test_store_controller.py
index e232ef3aad48..23049bc0e3da 100644
--- a/samples/openapi3/server/petstore/python-flask/openapi_server/test/test_store_controller.py
+++ b/samples/openapi3/server/petstore/python-flask/openapi_server/test/test_store_controller.py
@@ -4,7 +4,7 @@
 import unittest
 
 from flask import json
-from six import BytesIO
+from io import BytesIO
 
 from openapi_server.models.order import Order  # noqa: E501
 from openapi_server.test import BaseTestCase
diff --git a/samples/openapi3/server/petstore/python-flask/openapi_server/test/test_user_controller.py b/samples/openapi3/server/petstore/python-flask/openapi_server/test/test_user_controller.py
index 8f634b7cd6bf..36736dd6078a 100644
--- a/samples/openapi3/server/petstore/python-flask/openapi_server/test/test_user_controller.py
+++ b/samples/openapi3/server/petstore/python-flask/openapi_server/test/test_user_controller.py
@@ -4,7 +4,7 @@
 import unittest
 
 from flask import json
-from six import BytesIO
+from io import BytesIO
 
 from openapi_server.models.user import User  # noqa: E501
 from openapi_server.test import BaseTestCase
diff --git a/samples/openapi3/server/petstore/python-flask/openapi_server/util.py b/samples/openapi3/server/petstore/python-flask/openapi_server/util.py
index 2a63f2109ba5..f5f27cfdaba6 100644
--- a/samples/openapi3/server/petstore/python-flask/openapi_server/util.py
+++ b/samples/openapi3/server/petstore/python-flask/openapi_server/util.py
@@ -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 == int or klass in (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 = str(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()}
diff --git a/samples/server/petstore/python-blueplanet/app/openapi_server/controllers/pet_controller.py b/samples/server/petstore/python-blueplanet/app/openapi_server/controllers/pet_controller.py
index 8c47927bde67..9a6239dc04d5 100644
--- a/samples/server/petstore/python-blueplanet/app/openapi_server/controllers/pet_controller.py
+++ b/samples/server/petstore/python-blueplanet/app/openapi_server/controllers/pet_controller.py
@@ -1,5 +1,4 @@
 import connexion
-import six
 
 from app.openapi_server.models.api_response import ApiResponse  # noqa: E501
 from app.openapi_server.models.pet import Pet  # noqa: E501
diff --git a/samples/server/petstore/python-blueplanet/app/openapi_server/controllers/store_controller.py b/samples/server/petstore/python-blueplanet/app/openapi_server/controllers/store_controller.py
index b6485ae10a86..e1ae58967c58 100644
--- a/samples/server/petstore/python-blueplanet/app/openapi_server/controllers/store_controller.py
+++ b/samples/server/petstore/python-blueplanet/app/openapi_server/controllers/store_controller.py
@@ -1,5 +1,4 @@
 import connexion
-import six
 
 from app.openapi_server.models.order import Order  # noqa: E501
 from openapi_server import util
diff --git a/samples/server/petstore/python-blueplanet/app/openapi_server/controllers/user_controller.py b/samples/server/petstore/python-blueplanet/app/openapi_server/controllers/user_controller.py
index 147f8d1cbb99..49fd763d05e7 100644
--- a/samples/server/petstore/python-blueplanet/app/openapi_server/controllers/user_controller.py
+++ b/samples/server/petstore/python-blueplanet/app/openapi_server/controllers/user_controller.py
@@ -1,5 +1,4 @@
 import connexion
-import six
 
 from app.openapi_server.models.user import User  # noqa: E501
 from openapi_server import util
diff --git a/samples/server/petstore/python-blueplanet/app/openapi_server/encoder.py b/samples/server/petstore/python-blueplanet/app/openapi_server/encoder.py
index e20b15882061..c74e55e21013 100644
--- a/samples/server/petstore/python-blueplanet/app/openapi_server/encoder.py
+++ b/samples/server/petstore/python-blueplanet/app/openapi_server/encoder.py
@@ -1,5 +1,4 @@
 from connexion.apps.flask_app import FlaskJSONEncoder
-import six
 
 from app.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.swagger_types):
+            for attr in o.swagger_types:
                 value = getattr(o, attr)
                 if value is None and not self.include_nulls:
                     continue
diff --git a/samples/server/petstore/python-blueplanet/app/openapi_server/models/base_model.py b/samples/server/petstore/python-blueplanet/app/openapi_server/models/base_model.py
index b835b909b700..db5801aee4a1 100644
--- a/samples/server/petstore/python-blueplanet/app/openapi_server/models/base_model.py
+++ b/samples/server/petstore/python-blueplanet/app/openapi_server/models/base_model.py
@@ -1,6 +1,5 @@
 import pprint
 
-import six
 import typing
 
 from openapi_server import util
@@ -29,7 +28,7 @@ def to_dict(self):
         """
         result = {}
 
-        for attr, _ in six.iteritems(self.swagger_types):
+        for attr in self.swagger_types:
             value = getattr(self, attr)
             if isinstance(value, list):
                 result[attr] = list(map(
diff --git a/samples/server/petstore/python-blueplanet/app/openapi_server/test/test_pet_controller.py b/samples/server/petstore/python-blueplanet/app/openapi_server/test/test_pet_controller.py
index 70ce6ad26abb..397a1edcc446 100644
--- a/samples/server/petstore/python-blueplanet/app/openapi_server/test/test_pet_controller.py
+++ b/samples/server/petstore/python-blueplanet/app/openapi_server/test/test_pet_controller.py
@@ -3,7 +3,7 @@
 from __future__ import absolute_import
 
 from flask import json
-from six import BytesIO
+from io import BytesIO
 
 from app.openapi_server.models.api_response import ApiResponse  # noqa: E501
 from app.openapi_server.models.pet import Pet  # noqa: E501
diff --git a/samples/server/petstore/python-blueplanet/app/openapi_server/test/test_store_controller.py b/samples/server/petstore/python-blueplanet/app/openapi_server/test/test_store_controller.py
index 57bd3fa8f86f..4523c069b0cb 100644
--- a/samples/server/petstore/python-blueplanet/app/openapi_server/test/test_store_controller.py
+++ b/samples/server/petstore/python-blueplanet/app/openapi_server/test/test_store_controller.py
@@ -3,7 +3,7 @@
 from __future__ import absolute_import
 
 from flask import json
-from six import BytesIO
+from io import BytesIO
 
 from app.openapi_server.models.order import Order  # noqa: E501
 from openapi_server.test import BaseTestCase
diff --git a/samples/server/petstore/python-blueplanet/app/openapi_server/test/test_user_controller.py b/samples/server/petstore/python-blueplanet/app/openapi_server/test/test_user_controller.py
index e96791b1cc0f..ea223ee53429 100644
--- a/samples/server/petstore/python-blueplanet/app/openapi_server/test/test_user_controller.py
+++ b/samples/server/petstore/python-blueplanet/app/openapi_server/test/test_user_controller.py
@@ -3,7 +3,7 @@
 from __future__ import absolute_import
 
 from flask import json
-from six import BytesIO
+from io import BytesIO
 
 from app.openapi_server.models.user import User  # noqa: E501
 from openapi_server.test import BaseTestCase
diff --git a/samples/server/petstore/python-blueplanet/app/openapi_server/util.py b/samples/server/petstore/python-blueplanet/app/openapi_server/util.py
index fc9f8b16f0b3..76d827746245 100644
--- a/samples/server/petstore/python-blueplanet/app/openapi_server/util.py
+++ b/samples/server/petstore/python-blueplanet/app/openapi_server/util.py
@@ -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):
+    if klass == int or klass in (float, str, bool):
         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 = str(data)
     except TypeError:
         value = data
     return value
@@ -104,7 +103,7 @@ def deserialize_model(data, klass):
     if not instance.swagger_types:
         return data
 
-    for attr, attr_type in six.iteritems(instance.swagger_types):
+    for attr, attr_type in instance.swagger_types.items():
         if data is not None \
                 and instance.attribute_map[attr] in data \
                 and isinstance(data, (list, dict)):
@@ -139,4 +138,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()}
diff --git a/samples/server/petstore/python-fastapi/requirements.txt b/samples/server/petstore/python-fastapi/requirements.txt
index e5a1b375c4c3..10b044e70c91 100644
--- a/samples/server/petstore/python-fastapi/requirements.txt
+++ b/samples/server/petstore/python-fastapi/requirements.txt
@@ -26,7 +26,6 @@ python-multipart==0.0.5
 PyYAML==5.4.1
 requests==2.25.1
 Rx==1.6.1
-six==1.16.0
 starlette==0.27.0
 typing-extensions==3.10.0.0
 ujson==4.0.2