From 6fe2263fbaa002f07270e4fdd51b95c1643f0f2a Mon Sep 17 00:00:00 2001
From: Hugo Mercado <hugo.mario.mercado@gmail.com>
Date: Sun, 1 Sep 2019 03:23:55 -0500
Subject: [PATCH 1/9] fixed circular imports on python/flask generators models

---
 .../src/main/resources/flaskConnexion/model.mustache         | 4 +---
 .../swagger-codegen/src/main/resources/python/model.mustache | 5 -----
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/modules/swagger-codegen/src/main/resources/flaskConnexion/model.mustache b/modules/swagger-codegen/src/main/resources/flaskConnexion/model.mustache
index 7bb398f9f73..e918928e2f2 100644
--- a/modules/swagger-codegen/src/main/resources/flaskConnexion/model.mustache
+++ b/modules/swagger-codegen/src/main/resources/flaskConnexion/model.mustache
@@ -6,8 +6,6 @@ from datetime import date, datetime  # noqa: F401
 from typing import List, Dict  # noqa: F401
 
 from {{modelPackage}}.base_model_ import Model
-{{#imports}}{{import}}  # noqa: F401,E501
-{{/imports}}
 from {{packageName}} import util
 
 
@@ -158,4 +156,4 @@ class {{classname}}(Model):
 {{/vars}}
 
 {{/model}}
-{{/models}}
\ No newline at end of file
+{{/models}}
diff --git a/modules/swagger-codegen/src/main/resources/python/model.mustache b/modules/swagger-codegen/src/main/resources/python/model.mustache
index 3fc2747fe13..ef47cf50dc0 100644
--- a/modules/swagger-codegen/src/main/resources/python/model.mustache
+++ b/modules/swagger-codegen/src/main/resources/python/model.mustache
@@ -6,11 +6,6 @@ import pprint
 import re  # noqa: F401
 
 import six
-{{#imports}}{{#-first}}
-{{/-first}}
-{{import}}  # noqa: F401,E501
-{{/imports}}
-
 
 {{#models}}
 {{#model}}

From 5162e2ff01d69c07e2857dc8084f1ce7e40349f9 Mon Sep 17 00:00:00 2001
From: Hugo Mercado <hugo.mario.mercado@gmail.com>
Date: Sun, 1 Sep 2019 03:28:27 -0500
Subject: [PATCH 2/9] updated asyncio petstore sample

---
 .../client/petstore/python-asyncio/.swagger-codegen/VERSION  | 2 +-
 .../petstore_api/models/additional_properties_class.py       | 1 -
 .../petstore/python-asyncio/petstore_api/models/animal.py    | 1 -
 .../python-asyncio/petstore_api/models/animal_farm.py        | 3 ---
 .../python-asyncio/petstore_api/models/api_response.py       | 1 -
 .../petstore_api/models/array_of_array_of_number_only.py     | 1 -
 .../petstore_api/models/array_of_number_only.py              | 1 -
 .../python-asyncio/petstore_api/models/array_test.py         | 3 ---
 .../python-asyncio/petstore_api/models/capitalization.py     | 1 -
 .../petstore/python-asyncio/petstore_api/models/cat.py       | 3 ---
 .../petstore/python-asyncio/petstore_api/models/category.py  | 1 -
 .../python-asyncio/petstore_api/models/class_model.py        | 1 -
 .../petstore/python-asyncio/petstore_api/models/client.py    | 1 -
 .../petstore/python-asyncio/petstore_api/models/dog.py       | 3 ---
 .../python-asyncio/petstore_api/models/enum_arrays.py        | 1 -
 .../python-asyncio/petstore_api/models/enum_class.py         | 1 -
 .../petstore/python-asyncio/petstore_api/models/enum_test.py | 3 ---
 .../python-asyncio/petstore_api/models/format_test.py        | 1 -
 .../python-asyncio/petstore_api/models/has_only_read_only.py | 1 -
 .../petstore/python-asyncio/petstore_api/models/list.py      | 1 -
 .../petstore/python-asyncio/petstore_api/models/map_test.py  | 1 -
 .../mixed_properties_and_additional_properties_class.py      | 3 ---
 .../python-asyncio/petstore_api/models/model200_response.py  | 1 -
 .../python-asyncio/petstore_api/models/model_return.py       | 1 -
 .../petstore/python-asyncio/petstore_api/models/name.py      | 1 -
 .../python-asyncio/petstore_api/models/number_only.py        | 1 -
 .../petstore/python-asyncio/petstore_api/models/order.py     | 1 -
 .../python-asyncio/petstore_api/models/outer_boolean.py      | 1 -
 .../python-asyncio/petstore_api/models/outer_composite.py    | 5 -----
 .../python-asyncio/petstore_api/models/outer_enum.py         | 1 -
 .../python-asyncio/petstore_api/models/outer_number.py       | 1 -
 .../python-asyncio/petstore_api/models/outer_string.py       | 1 -
 .../petstore/python-asyncio/petstore_api/models/pet.py       | 4 ----
 .../python-asyncio/petstore_api/models/read_only_first.py    | 1 -
 .../python-asyncio/petstore_api/models/special_model_name.py | 1 -
 .../petstore/python-asyncio/petstore_api/models/tag.py       | 1 -
 .../petstore/python-asyncio/petstore_api/models/user.py      | 1 -
 37 files changed, 1 insertion(+), 56 deletions(-)

diff --git a/samples/client/petstore/python-asyncio/.swagger-codegen/VERSION b/samples/client/petstore/python-asyncio/.swagger-codegen/VERSION
index 017674fb59d..bba5a87afd0 100644
--- a/samples/client/petstore/python-asyncio/.swagger-codegen/VERSION
+++ b/samples/client/petstore/python-asyncio/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.4.3-SNAPSHOT
\ No newline at end of file
+2.4.9-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/additional_properties_class.py b/samples/client/petstore/python-asyncio/petstore_api/models/additional_properties_class.py
index 83de7092668..63bc21e2807 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/additional_properties_class.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/additional_properties_class.py
@@ -16,7 +16,6 @@
 
 import six
 
-
 class AdditionalPropertiesClass(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/animal.py b/samples/client/petstore/python-asyncio/petstore_api/models/animal.py
index 5175148b2d3..d5a562fae8e 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/animal.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/animal.py
@@ -16,7 +16,6 @@
 
 import six
 
-
 class Animal(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/animal_farm.py b/samples/client/petstore/python-asyncio/petstore_api/models/animal_farm.py
index e7904d7fbf6..6231d5e2997 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/animal_farm.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/animal_farm.py
@@ -16,9 +16,6 @@
 
 import six
 
-from petstore_api.models.animal import Animal  # noqa: F401,E501
-
-
 class AnimalFarm(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/api_response.py b/samples/client/petstore/python-asyncio/petstore_api/models/api_response.py
index 9da53da373b..200925dcc94 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/api_response.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/api_response.py
@@ -16,7 +16,6 @@
 
 import six
 
-
 class ApiResponse(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/array_of_array_of_number_only.py b/samples/client/petstore/python-asyncio/petstore_api/models/array_of_array_of_number_only.py
index 1e5e8be1ed1..9906156e821 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/array_of_array_of_number_only.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/array_of_array_of_number_only.py
@@ -16,7 +16,6 @@
 
 import six
 
-
 class ArrayOfArrayOfNumberOnly(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/array_of_number_only.py b/samples/client/petstore/python-asyncio/petstore_api/models/array_of_number_only.py
index 0628f7af1e7..646bd4393c5 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/array_of_number_only.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/array_of_number_only.py
@@ -16,7 +16,6 @@
 
 import six
 
-
 class ArrayOfNumberOnly(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/array_test.py b/samples/client/petstore/python-asyncio/petstore_api/models/array_test.py
index aa2d0d5e633..2f1a6c51e2a 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/array_test.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/array_test.py
@@ -16,9 +16,6 @@
 
 import six
 
-from petstore_api.models.read_only_first import ReadOnlyFirst  # noqa: F401,E501
-
-
 class ArrayTest(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/capitalization.py b/samples/client/petstore/python-asyncio/petstore_api/models/capitalization.py
index 83b0068aee2..05abe9956bd 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/capitalization.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/capitalization.py
@@ -16,7 +16,6 @@
 
 import six
 
-
 class Capitalization(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/cat.py b/samples/client/petstore/python-asyncio/petstore_api/models/cat.py
index 3660f18706b..041b42777ff 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/cat.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/cat.py
@@ -16,9 +16,6 @@
 
 import six
 
-from petstore_api.models.animal import Animal  # noqa: F401,E501
-
-
 class Cat(Animal):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/category.py b/samples/client/petstore/python-asyncio/petstore_api/models/category.py
index dbc4fd28816..42b3a25d9fd 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/category.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/category.py
@@ -16,7 +16,6 @@
 
 import six
 
-
 class Category(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/class_model.py b/samples/client/petstore/python-asyncio/petstore_api/models/class_model.py
index 6042036beb5..851bd07170f 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/class_model.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/class_model.py
@@ -16,7 +16,6 @@
 
 import six
 
-
 class ClassModel(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/client.py b/samples/client/petstore/python-asyncio/petstore_api/models/client.py
index 337100c3946..6ec6aa466c8 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/client.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/client.py
@@ -16,7 +16,6 @@
 
 import six
 
-
 class Client(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/dog.py b/samples/client/petstore/python-asyncio/petstore_api/models/dog.py
index 3d80d6442f4..940d9c72806 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/dog.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/dog.py
@@ -16,9 +16,6 @@
 
 import six
 
-from petstore_api.models.animal import Animal  # noqa: F401,E501
-
-
 class Dog(Animal):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/enum_arrays.py b/samples/client/petstore/python-asyncio/petstore_api/models/enum_arrays.py
index 5257b181b88..4ded72ab35c 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/enum_arrays.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/enum_arrays.py
@@ -16,7 +16,6 @@
 
 import six
 
-
 class EnumArrays(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/enum_class.py b/samples/client/petstore/python-asyncio/petstore_api/models/enum_class.py
index 2282270dda1..55ead16cfdd 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/enum_class.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/enum_class.py
@@ -16,7 +16,6 @@
 
 import six
 
-
 class EnumClass(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/enum_test.py b/samples/client/petstore/python-asyncio/petstore_api/models/enum_test.py
index d977ef918bc..d56e6c54484 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/enum_test.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/enum_test.py
@@ -16,9 +16,6 @@
 
 import six
 
-from petstore_api.models.outer_enum import OuterEnum  # noqa: F401,E501
-
-
 class EnumTest(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/format_test.py b/samples/client/petstore/python-asyncio/petstore_api/models/format_test.py
index 206b991719d..a9a05c023ce 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/format_test.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/format_test.py
@@ -16,7 +16,6 @@
 
 import six
 
-
 class FormatTest(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/has_only_read_only.py b/samples/client/petstore/python-asyncio/petstore_api/models/has_only_read_only.py
index 76e5ceb1e22..44763cc757d 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/has_only_read_only.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/has_only_read_only.py
@@ -16,7 +16,6 @@
 
 import six
 
-
 class HasOnlyReadOnly(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/list.py b/samples/client/petstore/python-asyncio/petstore_api/models/list.py
index 46eef1e90f3..d87f84250dd 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/list.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/list.py
@@ -16,7 +16,6 @@
 
 import six
 
-
 class List(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/map_test.py b/samples/client/petstore/python-asyncio/petstore_api/models/map_test.py
index f2633c30a99..e04bbdb5c6b 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/map_test.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/map_test.py
@@ -16,7 +16,6 @@
 
 import six
 
-
 class MapTest(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/mixed_properties_and_additional_properties_class.py b/samples/client/petstore/python-asyncio/petstore_api/models/mixed_properties_and_additional_properties_class.py
index dfed6cc90bd..213def41e7a 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/mixed_properties_and_additional_properties_class.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/mixed_properties_and_additional_properties_class.py
@@ -16,9 +16,6 @@
 
 import six
 
-from petstore_api.models.animal import Animal  # noqa: F401,E501
-
-
 class MixedPropertiesAndAdditionalPropertiesClass(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/model200_response.py b/samples/client/petstore/python-asyncio/petstore_api/models/model200_response.py
index 1fcaabca10e..a23e44d27e7 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/model200_response.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/model200_response.py
@@ -16,7 +16,6 @@
 
 import six
 
-
 class Model200Response(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/model_return.py b/samples/client/petstore/python-asyncio/petstore_api/models/model_return.py
index 79253611495..d500dfde2b5 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/model_return.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/model_return.py
@@ -16,7 +16,6 @@
 
 import six
 
-
 class ModelReturn(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/name.py b/samples/client/petstore/python-asyncio/petstore_api/models/name.py
index 53be7953ea9..32278ab3a99 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/name.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/name.py
@@ -16,7 +16,6 @@
 
 import six
 
-
 class Name(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/number_only.py b/samples/client/petstore/python-asyncio/petstore_api/models/number_only.py
index 2f43a834f8b..08a43e9e85f 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/number_only.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/number_only.py
@@ -16,7 +16,6 @@
 
 import six
 
-
 class NumberOnly(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/order.py b/samples/client/petstore/python-asyncio/petstore_api/models/order.py
index 9291652787e..f1357a920df 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/order.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/order.py
@@ -16,7 +16,6 @@
 
 import six
 
-
 class Order(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/outer_boolean.py b/samples/client/petstore/python-asyncio/petstore_api/models/outer_boolean.py
index 3b273333e75..5b3066c2d35 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/outer_boolean.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/outer_boolean.py
@@ -16,7 +16,6 @@
 
 import six
 
-
 class OuterBoolean(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/outer_composite.py b/samples/client/petstore/python-asyncio/petstore_api/models/outer_composite.py
index 36381acb861..3d3be1a3801 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/outer_composite.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/outer_composite.py
@@ -16,11 +16,6 @@
 
 import six
 
-from petstore_api.models.outer_boolean import OuterBoolean  # noqa: F401,E501
-from petstore_api.models.outer_number import OuterNumber  # noqa: F401,E501
-from petstore_api.models.outer_string import OuterString  # noqa: F401,E501
-
-
 class OuterComposite(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/outer_enum.py b/samples/client/petstore/python-asyncio/petstore_api/models/outer_enum.py
index bea07410cf2..b48ab7dfb6a 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/outer_enum.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/outer_enum.py
@@ -16,7 +16,6 @@
 
 import six
 
-
 class OuterEnum(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/outer_number.py b/samples/client/petstore/python-asyncio/petstore_api/models/outer_number.py
index a60e97c8288..048ad15312e 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/outer_number.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/outer_number.py
@@ -16,7 +16,6 @@
 
 import six
 
-
 class OuterNumber(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/outer_string.py b/samples/client/petstore/python-asyncio/petstore_api/models/outer_string.py
index 622589ce2f6..f116ff52d9c 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/outer_string.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/outer_string.py
@@ -16,7 +16,6 @@
 
 import six
 
-
 class OuterString(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/pet.py b/samples/client/petstore/python-asyncio/petstore_api/models/pet.py
index c7c206c7a93..e33d76de6c5 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/pet.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/pet.py
@@ -16,10 +16,6 @@
 
 import six
 
-from petstore_api.models.category import Category  # noqa: F401,E501
-from petstore_api.models.tag import Tag  # noqa: F401,E501
-
-
 class Pet(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/read_only_first.py b/samples/client/petstore/python-asyncio/petstore_api/models/read_only_first.py
index 0a378f93da6..62d38b61c69 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/read_only_first.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/read_only_first.py
@@ -16,7 +16,6 @@
 
 import six
 
-
 class ReadOnlyFirst(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/special_model_name.py b/samples/client/petstore/python-asyncio/petstore_api/models/special_model_name.py
index 3817430b656..23603b09349 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/special_model_name.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/special_model_name.py
@@ -16,7 +16,6 @@
 
 import six
 
-
 class SpecialModelName(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/tag.py b/samples/client/petstore/python-asyncio/petstore_api/models/tag.py
index dc3c0b5645f..470d9082dd9 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/tag.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/tag.py
@@ -16,7 +16,6 @@
 
 import six
 
-
 class Tag(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/user.py b/samples/client/petstore/python-asyncio/petstore_api/models/user.py
index 8dcac91845f..57bd119538d 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/user.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/user.py
@@ -16,7 +16,6 @@
 
 import six
 
-
 class User(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 

From 85acae646e2b4fbfa1ccf8784d45ca2f0aa6704e Mon Sep 17 00:00:00 2001
From: Hugo Mercado <hugo.mario.mercado@gmail.com>
Date: Sun, 1 Sep 2019 03:47:16 -0500
Subject: [PATCH 3/9] updated python petstore sample

---
 samples/client/petstore/python/.swagger-codegen/VERSION      | 2 +-
 .../petstore_api/models/additional_properties_class.py       | 1 -
 samples/client/petstore/python/petstore_api/models/animal.py | 1 -
 .../petstore/python/petstore_api/models/animal_farm.py       | 3 ---
 .../petstore/python/petstore_api/models/api_response.py      | 1 -
 .../petstore_api/models/array_of_array_of_number_only.py     | 1 -
 .../python/petstore_api/models/array_of_number_only.py       | 1 -
 .../client/petstore/python/petstore_api/models/array_test.py | 3 ---
 .../petstore/python/petstore_api/models/capitalization.py    | 1 -
 samples/client/petstore/python/petstore_api/models/cat.py    | 3 ---
 .../client/petstore/python/petstore_api/models/category.py   | 1 -
 .../petstore/python/petstore_api/models/class_model.py       | 1 -
 samples/client/petstore/python/petstore_api/models/client.py | 1 -
 samples/client/petstore/python/petstore_api/models/dog.py    | 3 ---
 .../petstore/python/petstore_api/models/enum_arrays.py       | 1 -
 .../client/petstore/python/petstore_api/models/enum_class.py | 1 -
 .../client/petstore/python/petstore_api/models/enum_test.py  | 3 ---
 .../petstore/python/petstore_api/models/format_test.py       | 1 -
 .../python/petstore_api/models/has_only_read_only.py         | 1 -
 samples/client/petstore/python/petstore_api/models/list.py   | 1 -
 .../client/petstore/python/petstore_api/models/map_test.py   | 1 -
 .../mixed_properties_and_additional_properties_class.py      | 3 ---
 .../petstore/python/petstore_api/models/model200_response.py | 1 -
 .../petstore/python/petstore_api/models/model_return.py      | 1 -
 samples/client/petstore/python/petstore_api/models/name.py   | 1 -
 .../petstore/python/petstore_api/models/number_only.py       | 1 -
 samples/client/petstore/python/petstore_api/models/order.py  | 1 -
 .../petstore/python/petstore_api/models/outer_boolean.py     | 1 -
 .../petstore/python/petstore_api/models/outer_composite.py   | 5 -----
 .../client/petstore/python/petstore_api/models/outer_enum.py | 1 -
 .../petstore/python/petstore_api/models/outer_number.py      | 1 -
 .../petstore/python/petstore_api/models/outer_string.py      | 1 -
 samples/client/petstore/python/petstore_api/models/pet.py    | 4 ----
 .../petstore/python/petstore_api/models/read_only_first.py   | 1 -
 .../python/petstore_api/models/special_model_name.py         | 1 -
 samples/client/petstore/python/petstore_api/models/tag.py    | 1 -
 samples/client/petstore/python/petstore_api/models/user.py   | 1 -
 37 files changed, 1 insertion(+), 56 deletions(-)

diff --git a/samples/client/petstore/python/.swagger-codegen/VERSION b/samples/client/petstore/python/.swagger-codegen/VERSION
index 017674fb59d..bba5a87afd0 100644
--- a/samples/client/petstore/python/.swagger-codegen/VERSION
+++ b/samples/client/petstore/python/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.4.3-SNAPSHOT
\ No newline at end of file
+2.4.9-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/python/petstore_api/models/additional_properties_class.py b/samples/client/petstore/python/petstore_api/models/additional_properties_class.py
index 83de7092668..63bc21e2807 100644
--- a/samples/client/petstore/python/petstore_api/models/additional_properties_class.py
+++ b/samples/client/petstore/python/petstore_api/models/additional_properties_class.py
@@ -16,7 +16,6 @@
 
 import six
 
-
 class AdditionalPropertiesClass(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python/petstore_api/models/animal.py b/samples/client/petstore/python/petstore_api/models/animal.py
index 5175148b2d3..d5a562fae8e 100644
--- a/samples/client/petstore/python/petstore_api/models/animal.py
+++ b/samples/client/petstore/python/petstore_api/models/animal.py
@@ -16,7 +16,6 @@
 
 import six
 
-
 class Animal(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python/petstore_api/models/animal_farm.py b/samples/client/petstore/python/petstore_api/models/animal_farm.py
index e7904d7fbf6..6231d5e2997 100644
--- a/samples/client/petstore/python/petstore_api/models/animal_farm.py
+++ b/samples/client/petstore/python/petstore_api/models/animal_farm.py
@@ -16,9 +16,6 @@
 
 import six
 
-from petstore_api.models.animal import Animal  # noqa: F401,E501
-
-
 class AnimalFarm(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python/petstore_api/models/api_response.py b/samples/client/petstore/python/petstore_api/models/api_response.py
index 9da53da373b..200925dcc94 100644
--- a/samples/client/petstore/python/petstore_api/models/api_response.py
+++ b/samples/client/petstore/python/petstore_api/models/api_response.py
@@ -16,7 +16,6 @@
 
 import six
 
-
 class ApiResponse(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python/petstore_api/models/array_of_array_of_number_only.py b/samples/client/petstore/python/petstore_api/models/array_of_array_of_number_only.py
index 1e5e8be1ed1..9906156e821 100644
--- a/samples/client/petstore/python/petstore_api/models/array_of_array_of_number_only.py
+++ b/samples/client/petstore/python/petstore_api/models/array_of_array_of_number_only.py
@@ -16,7 +16,6 @@
 
 import six
 
-
 class ArrayOfArrayOfNumberOnly(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python/petstore_api/models/array_of_number_only.py b/samples/client/petstore/python/petstore_api/models/array_of_number_only.py
index 0628f7af1e7..646bd4393c5 100644
--- a/samples/client/petstore/python/petstore_api/models/array_of_number_only.py
+++ b/samples/client/petstore/python/petstore_api/models/array_of_number_only.py
@@ -16,7 +16,6 @@
 
 import six
 
-
 class ArrayOfNumberOnly(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python/petstore_api/models/array_test.py b/samples/client/petstore/python/petstore_api/models/array_test.py
index aa2d0d5e633..2f1a6c51e2a 100644
--- a/samples/client/petstore/python/petstore_api/models/array_test.py
+++ b/samples/client/petstore/python/petstore_api/models/array_test.py
@@ -16,9 +16,6 @@
 
 import six
 
-from petstore_api.models.read_only_first import ReadOnlyFirst  # noqa: F401,E501
-
-
 class ArrayTest(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python/petstore_api/models/capitalization.py b/samples/client/petstore/python/petstore_api/models/capitalization.py
index 83b0068aee2..05abe9956bd 100644
--- a/samples/client/petstore/python/petstore_api/models/capitalization.py
+++ b/samples/client/petstore/python/petstore_api/models/capitalization.py
@@ -16,7 +16,6 @@
 
 import six
 
-
 class Capitalization(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python/petstore_api/models/cat.py b/samples/client/petstore/python/petstore_api/models/cat.py
index 3660f18706b..041b42777ff 100644
--- a/samples/client/petstore/python/petstore_api/models/cat.py
+++ b/samples/client/petstore/python/petstore_api/models/cat.py
@@ -16,9 +16,6 @@
 
 import six
 
-from petstore_api.models.animal import Animal  # noqa: F401,E501
-
-
 class Cat(Animal):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python/petstore_api/models/category.py b/samples/client/petstore/python/petstore_api/models/category.py
index dbc4fd28816..42b3a25d9fd 100644
--- a/samples/client/petstore/python/petstore_api/models/category.py
+++ b/samples/client/petstore/python/petstore_api/models/category.py
@@ -16,7 +16,6 @@
 
 import six
 
-
 class Category(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python/petstore_api/models/class_model.py b/samples/client/petstore/python/petstore_api/models/class_model.py
index 6042036beb5..851bd07170f 100644
--- a/samples/client/petstore/python/petstore_api/models/class_model.py
+++ b/samples/client/petstore/python/petstore_api/models/class_model.py
@@ -16,7 +16,6 @@
 
 import six
 
-
 class ClassModel(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python/petstore_api/models/client.py b/samples/client/petstore/python/petstore_api/models/client.py
index 337100c3946..6ec6aa466c8 100644
--- a/samples/client/petstore/python/petstore_api/models/client.py
+++ b/samples/client/petstore/python/petstore_api/models/client.py
@@ -16,7 +16,6 @@
 
 import six
 
-
 class Client(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python/petstore_api/models/dog.py b/samples/client/petstore/python/petstore_api/models/dog.py
index 3d80d6442f4..940d9c72806 100644
--- a/samples/client/petstore/python/petstore_api/models/dog.py
+++ b/samples/client/petstore/python/petstore_api/models/dog.py
@@ -16,9 +16,6 @@
 
 import six
 
-from petstore_api.models.animal import Animal  # noqa: F401,E501
-
-
 class Dog(Animal):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python/petstore_api/models/enum_arrays.py b/samples/client/petstore/python/petstore_api/models/enum_arrays.py
index 5257b181b88..4ded72ab35c 100644
--- a/samples/client/petstore/python/petstore_api/models/enum_arrays.py
+++ b/samples/client/petstore/python/petstore_api/models/enum_arrays.py
@@ -16,7 +16,6 @@
 
 import six
 
-
 class EnumArrays(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python/petstore_api/models/enum_class.py b/samples/client/petstore/python/petstore_api/models/enum_class.py
index 2282270dda1..55ead16cfdd 100644
--- a/samples/client/petstore/python/petstore_api/models/enum_class.py
+++ b/samples/client/petstore/python/petstore_api/models/enum_class.py
@@ -16,7 +16,6 @@
 
 import six
 
-
 class EnumClass(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python/petstore_api/models/enum_test.py b/samples/client/petstore/python/petstore_api/models/enum_test.py
index d977ef918bc..d56e6c54484 100644
--- a/samples/client/petstore/python/petstore_api/models/enum_test.py
+++ b/samples/client/petstore/python/petstore_api/models/enum_test.py
@@ -16,9 +16,6 @@
 
 import six
 
-from petstore_api.models.outer_enum import OuterEnum  # noqa: F401,E501
-
-
 class EnumTest(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python/petstore_api/models/format_test.py b/samples/client/petstore/python/petstore_api/models/format_test.py
index 206b991719d..a9a05c023ce 100644
--- a/samples/client/petstore/python/petstore_api/models/format_test.py
+++ b/samples/client/petstore/python/petstore_api/models/format_test.py
@@ -16,7 +16,6 @@
 
 import six
 
-
 class FormatTest(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python/petstore_api/models/has_only_read_only.py b/samples/client/petstore/python/petstore_api/models/has_only_read_only.py
index 76e5ceb1e22..44763cc757d 100644
--- a/samples/client/petstore/python/petstore_api/models/has_only_read_only.py
+++ b/samples/client/petstore/python/petstore_api/models/has_only_read_only.py
@@ -16,7 +16,6 @@
 
 import six
 
-
 class HasOnlyReadOnly(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python/petstore_api/models/list.py b/samples/client/petstore/python/petstore_api/models/list.py
index 46eef1e90f3..d87f84250dd 100644
--- a/samples/client/petstore/python/petstore_api/models/list.py
+++ b/samples/client/petstore/python/petstore_api/models/list.py
@@ -16,7 +16,6 @@
 
 import six
 
-
 class List(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python/petstore_api/models/map_test.py b/samples/client/petstore/python/petstore_api/models/map_test.py
index f2633c30a99..e04bbdb5c6b 100644
--- a/samples/client/petstore/python/petstore_api/models/map_test.py
+++ b/samples/client/petstore/python/petstore_api/models/map_test.py
@@ -16,7 +16,6 @@
 
 import six
 
-
 class MapTest(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python/petstore_api/models/mixed_properties_and_additional_properties_class.py b/samples/client/petstore/python/petstore_api/models/mixed_properties_and_additional_properties_class.py
index dfed6cc90bd..213def41e7a 100644
--- a/samples/client/petstore/python/petstore_api/models/mixed_properties_and_additional_properties_class.py
+++ b/samples/client/petstore/python/petstore_api/models/mixed_properties_and_additional_properties_class.py
@@ -16,9 +16,6 @@
 
 import six
 
-from petstore_api.models.animal import Animal  # noqa: F401,E501
-
-
 class MixedPropertiesAndAdditionalPropertiesClass(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python/petstore_api/models/model200_response.py b/samples/client/petstore/python/petstore_api/models/model200_response.py
index 1fcaabca10e..a23e44d27e7 100644
--- a/samples/client/petstore/python/petstore_api/models/model200_response.py
+++ b/samples/client/petstore/python/petstore_api/models/model200_response.py
@@ -16,7 +16,6 @@
 
 import six
 
-
 class Model200Response(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python/petstore_api/models/model_return.py b/samples/client/petstore/python/petstore_api/models/model_return.py
index 79253611495..d500dfde2b5 100644
--- a/samples/client/petstore/python/petstore_api/models/model_return.py
+++ b/samples/client/petstore/python/petstore_api/models/model_return.py
@@ -16,7 +16,6 @@
 
 import six
 
-
 class ModelReturn(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python/petstore_api/models/name.py b/samples/client/petstore/python/petstore_api/models/name.py
index 53be7953ea9..32278ab3a99 100644
--- a/samples/client/petstore/python/petstore_api/models/name.py
+++ b/samples/client/petstore/python/petstore_api/models/name.py
@@ -16,7 +16,6 @@
 
 import six
 
-
 class Name(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python/petstore_api/models/number_only.py b/samples/client/petstore/python/petstore_api/models/number_only.py
index 2f43a834f8b..08a43e9e85f 100644
--- a/samples/client/petstore/python/petstore_api/models/number_only.py
+++ b/samples/client/petstore/python/petstore_api/models/number_only.py
@@ -16,7 +16,6 @@
 
 import six
 
-
 class NumberOnly(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python/petstore_api/models/order.py b/samples/client/petstore/python/petstore_api/models/order.py
index 9291652787e..f1357a920df 100644
--- a/samples/client/petstore/python/petstore_api/models/order.py
+++ b/samples/client/petstore/python/petstore_api/models/order.py
@@ -16,7 +16,6 @@
 
 import six
 
-
 class Order(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python/petstore_api/models/outer_boolean.py b/samples/client/petstore/python/petstore_api/models/outer_boolean.py
index 3b273333e75..5b3066c2d35 100644
--- a/samples/client/petstore/python/petstore_api/models/outer_boolean.py
+++ b/samples/client/petstore/python/petstore_api/models/outer_boolean.py
@@ -16,7 +16,6 @@
 
 import six
 
-
 class OuterBoolean(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python/petstore_api/models/outer_composite.py b/samples/client/petstore/python/petstore_api/models/outer_composite.py
index 36381acb861..3d3be1a3801 100644
--- a/samples/client/petstore/python/petstore_api/models/outer_composite.py
+++ b/samples/client/petstore/python/petstore_api/models/outer_composite.py
@@ -16,11 +16,6 @@
 
 import six
 
-from petstore_api.models.outer_boolean import OuterBoolean  # noqa: F401,E501
-from petstore_api.models.outer_number import OuterNumber  # noqa: F401,E501
-from petstore_api.models.outer_string import OuterString  # noqa: F401,E501
-
-
 class OuterComposite(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python/petstore_api/models/outer_enum.py b/samples/client/petstore/python/petstore_api/models/outer_enum.py
index bea07410cf2..b48ab7dfb6a 100644
--- a/samples/client/petstore/python/petstore_api/models/outer_enum.py
+++ b/samples/client/petstore/python/petstore_api/models/outer_enum.py
@@ -16,7 +16,6 @@
 
 import six
 
-
 class OuterEnum(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python/petstore_api/models/outer_number.py b/samples/client/petstore/python/petstore_api/models/outer_number.py
index a60e97c8288..048ad15312e 100644
--- a/samples/client/petstore/python/petstore_api/models/outer_number.py
+++ b/samples/client/petstore/python/petstore_api/models/outer_number.py
@@ -16,7 +16,6 @@
 
 import six
 
-
 class OuterNumber(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python/petstore_api/models/outer_string.py b/samples/client/petstore/python/petstore_api/models/outer_string.py
index 622589ce2f6..f116ff52d9c 100644
--- a/samples/client/petstore/python/petstore_api/models/outer_string.py
+++ b/samples/client/petstore/python/petstore_api/models/outer_string.py
@@ -16,7 +16,6 @@
 
 import six
 
-
 class OuterString(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python/petstore_api/models/pet.py b/samples/client/petstore/python/petstore_api/models/pet.py
index c7c206c7a93..e33d76de6c5 100644
--- a/samples/client/petstore/python/petstore_api/models/pet.py
+++ b/samples/client/petstore/python/petstore_api/models/pet.py
@@ -16,10 +16,6 @@
 
 import six
 
-from petstore_api.models.category import Category  # noqa: F401,E501
-from petstore_api.models.tag import Tag  # noqa: F401,E501
-
-
 class Pet(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python/petstore_api/models/read_only_first.py b/samples/client/petstore/python/petstore_api/models/read_only_first.py
index 0a378f93da6..62d38b61c69 100644
--- a/samples/client/petstore/python/petstore_api/models/read_only_first.py
+++ b/samples/client/petstore/python/petstore_api/models/read_only_first.py
@@ -16,7 +16,6 @@
 
 import six
 
-
 class ReadOnlyFirst(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python/petstore_api/models/special_model_name.py b/samples/client/petstore/python/petstore_api/models/special_model_name.py
index 3817430b656..23603b09349 100644
--- a/samples/client/petstore/python/petstore_api/models/special_model_name.py
+++ b/samples/client/petstore/python/petstore_api/models/special_model_name.py
@@ -16,7 +16,6 @@
 
 import six
 
-
 class SpecialModelName(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python/petstore_api/models/tag.py b/samples/client/petstore/python/petstore_api/models/tag.py
index dc3c0b5645f..470d9082dd9 100644
--- a/samples/client/petstore/python/petstore_api/models/tag.py
+++ b/samples/client/petstore/python/petstore_api/models/tag.py
@@ -16,7 +16,6 @@
 
 import six
 
-
 class Tag(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python/petstore_api/models/user.py b/samples/client/petstore/python/petstore_api/models/user.py
index 8dcac91845f..57bd119538d 100644
--- a/samples/client/petstore/python/petstore_api/models/user.py
+++ b/samples/client/petstore/python/petstore_api/models/user.py
@@ -16,7 +16,6 @@
 
 import six
 
-
 class User(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 

From 58adfb8138e27972ac8bd70549449b677d55e2bb Mon Sep 17 00:00:00 2001
From: Hugo Mercado <hugo.mario.mercado@gmail.com>
Date: Sun, 1 Sep 2019 03:53:53 -0500
Subject: [PATCH 4/9] updated flask petstore sample.

---
 .../flaskConnexion/.swagger-codegen/VERSION   |  2 +-
 .../swagger_server/models/pet.py              |  2 --
 .../swagger_server/swagger/swagger.yaml       | 20 -------------------
 3 files changed, 1 insertion(+), 23 deletions(-)

diff --git a/samples/server/petstore/flaskConnexion/.swagger-codegen/VERSION b/samples/server/petstore/flaskConnexion/.swagger-codegen/VERSION
index 017674fb59d..bba5a87afd0 100644
--- a/samples/server/petstore/flaskConnexion/.swagger-codegen/VERSION
+++ b/samples/server/petstore/flaskConnexion/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.4.3-SNAPSHOT
\ No newline at end of file
+2.4.9-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/flaskConnexion/swagger_server/models/pet.py b/samples/server/petstore/flaskConnexion/swagger_server/models/pet.py
index 5fa728911de..de4051d9a20 100644
--- a/samples/server/petstore/flaskConnexion/swagger_server/models/pet.py
+++ b/samples/server/petstore/flaskConnexion/swagger_server/models/pet.py
@@ -6,8 +6,6 @@
 from typing import List, Dict  # noqa: F401
 
 from swagger_server.models.base_model_ import Model
-from swagger_server.models.category import Category  # noqa: F401,E501
-from swagger_server.models.tag import Tag  # noqa: F401,E501
 from swagger_server import util
 
 
diff --git a/samples/server/petstore/flaskConnexion/swagger_server/swagger/swagger.yaml b/samples/server/petstore/flaskConnexion/swagger_server/swagger/swagger.yaml
index 5d95d07fa1f..69bab8f7863 100644
--- a/samples/server/petstore/flaskConnexion/swagger_server/swagger/swagger.yaml
+++ b/samples/server/petstore/flaskConnexion/swagger_server/swagger/swagger.yaml
@@ -59,7 +59,6 @@ paths:
         - "write:pets"
         - "read:pets"
       x-swagger-router-controller: "swagger_server.controllers.pet_controller"
-      x-is-post-method: true
     put:
       tags:
       - "pet"
@@ -91,7 +90,6 @@ paths:
         - "write:pets"
         - "read:pets"
       x-swagger-router-controller: "swagger_server.controllers.pet_controller"
-      x-is-put-method: true
   /pet/findByStatus:
     get:
       tags:
@@ -130,7 +128,6 @@ paths:
         - "write:pets"
         - "read:pets"
       x-swagger-router-controller: "swagger_server.controllers.pet_controller"
-      x-is-get-method: true
   /pet/findByTags:
     get:
       tags:
@@ -166,7 +163,6 @@ paths:
         - "read:pets"
       deprecated: true
       x-swagger-router-controller: "swagger_server.controllers.pet_controller"
-      x-is-get-method: true
   /pet/{petId}:
     get:
       tags:
@@ -196,7 +192,6 @@ paths:
       security:
       - api_key: []
       x-swagger-router-controller: "swagger_server.controllers.pet_controller"
-      x-is-get-method: true
     post:
       tags:
       - "pet"
@@ -233,7 +228,6 @@ paths:
         - "write:pets"
         - "read:pets"
       x-swagger-router-controller: "swagger_server.controllers.pet_controller"
-      x-is-post-method: true
     delete:
       tags:
       - "pet"
@@ -262,7 +256,6 @@ paths:
         - "write:pets"
         - "read:pets"
       x-swagger-router-controller: "swagger_server.controllers.pet_controller"
-      x-is-delete-method: true
   /pet/{petId}/uploadImage:
     post:
       tags:
@@ -301,7 +294,6 @@ paths:
         - "write:pets"
         - "read:pets"
       x-swagger-router-controller: "swagger_server.controllers.pet_controller"
-      x-is-post-method: true
   /store/inventory:
     get:
       tags:
@@ -323,7 +315,6 @@ paths:
       security:
       - api_key: []
       x-swagger-router-controller: "swagger_server.controllers.store_controller"
-      x-is-get-method: true
   /store/order:
     post:
       tags:
@@ -349,7 +340,6 @@ paths:
         400:
           description: "Invalid Order"
       x-swagger-router-controller: "swagger_server.controllers.store_controller"
-      x-is-post-method: true
   /store/order/{orderId}:
     get:
       tags:
@@ -380,7 +370,6 @@ paths:
         404:
           description: "Order not found"
       x-swagger-router-controller: "swagger_server.controllers.store_controller"
-      x-is-get-method: true
     delete:
       tags:
       - "store"
@@ -403,7 +392,6 @@ paths:
         404:
           description: "Order not found"
       x-swagger-router-controller: "swagger_server.controllers.store_controller"
-      x-is-delete-method: true
   /user:
     post:
       tags:
@@ -425,7 +413,6 @@ paths:
         default:
           description: "successful operation"
       x-swagger-router-controller: "swagger_server.controllers.user_controller"
-      x-is-post-method: true
   /user/createWithArray:
     post:
       tags:
@@ -449,7 +436,6 @@ paths:
         default:
           description: "successful operation"
       x-swagger-router-controller: "swagger_server.controllers.user_controller"
-      x-is-post-method: true
   /user/createWithList:
     post:
       tags:
@@ -473,7 +459,6 @@ paths:
         default:
           description: "successful operation"
       x-swagger-router-controller: "swagger_server.controllers.user_controller"
-      x-is-post-method: true
   /user/login:
     get:
       tags:
@@ -512,7 +497,6 @@ paths:
         400:
           description: "Invalid username/password supplied"
       x-swagger-router-controller: "swagger_server.controllers.user_controller"
-      x-is-get-method: true
   /user/logout:
     get:
       tags:
@@ -528,7 +512,6 @@ paths:
         default:
           description: "successful operation"
       x-swagger-router-controller: "swagger_server.controllers.user_controller"
-      x-is-get-method: true
   /user/{username}:
     get:
       tags:
@@ -555,7 +538,6 @@ paths:
         404:
           description: "User not found"
       x-swagger-router-controller: "swagger_server.controllers.user_controller"
-      x-is-get-method: true
     put:
       tags:
       - "user"
@@ -583,7 +565,6 @@ paths:
         404:
           description: "User not found"
       x-swagger-router-controller: "swagger_server.controllers.user_controller"
-      x-is-put-method: true
     delete:
       tags:
       - "user"
@@ -605,7 +586,6 @@ paths:
         404:
           description: "User not found"
       x-swagger-router-controller: "swagger_server.controllers.user_controller"
-      x-is-delete-method: true
 securityDefinitions:
   petstore_auth:
     type: "oauth2"

From dae16bc1e4ebfad173bd66a7665e750a55a3a4c2 Mon Sep 17 00:00:00 2001
From: Hugo Mercado <hugo.mario.mercado@gmail.com>
Date: Sun, 1 Sep 2019 03:55:11 -0500
Subject: [PATCH 5/9] updated python2 flask sample

---
 .../.swagger-codegen/VERSION                  |  2 +-
 .../swagger_server/models/pet.py              |  2 --
 .../swagger_server/swagger/swagger.yaml       | 20 -------------------
 3 files changed, 1 insertion(+), 23 deletions(-)

diff --git a/samples/server/petstore/flaskConnexion-python2/.swagger-codegen/VERSION b/samples/server/petstore/flaskConnexion-python2/.swagger-codegen/VERSION
index 017674fb59d..bba5a87afd0 100644
--- a/samples/server/petstore/flaskConnexion-python2/.swagger-codegen/VERSION
+++ b/samples/server/petstore/flaskConnexion-python2/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.4.3-SNAPSHOT
\ No newline at end of file
+2.4.9-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/flaskConnexion-python2/swagger_server/models/pet.py b/samples/server/petstore/flaskConnexion-python2/swagger_server/models/pet.py
index 0f8e96dcd56..35e03968263 100644
--- a/samples/server/petstore/flaskConnexion-python2/swagger_server/models/pet.py
+++ b/samples/server/petstore/flaskConnexion-python2/swagger_server/models/pet.py
@@ -6,8 +6,6 @@
 from typing import List, Dict  # noqa: F401
 
 from swagger_server.models.base_model_ import Model
-from swagger_server.models.category import Category  # noqa: F401,E501
-from swagger_server.models.tag import Tag  # noqa: F401,E501
 from swagger_server import util
 
 
diff --git a/samples/server/petstore/flaskConnexion-python2/swagger_server/swagger/swagger.yaml b/samples/server/petstore/flaskConnexion-python2/swagger_server/swagger/swagger.yaml
index 5d95d07fa1f..69bab8f7863 100644
--- a/samples/server/petstore/flaskConnexion-python2/swagger_server/swagger/swagger.yaml
+++ b/samples/server/petstore/flaskConnexion-python2/swagger_server/swagger/swagger.yaml
@@ -59,7 +59,6 @@ paths:
         - "write:pets"
         - "read:pets"
       x-swagger-router-controller: "swagger_server.controllers.pet_controller"
-      x-is-post-method: true
     put:
       tags:
       - "pet"
@@ -91,7 +90,6 @@ paths:
         - "write:pets"
         - "read:pets"
       x-swagger-router-controller: "swagger_server.controllers.pet_controller"
-      x-is-put-method: true
   /pet/findByStatus:
     get:
       tags:
@@ -130,7 +128,6 @@ paths:
         - "write:pets"
         - "read:pets"
       x-swagger-router-controller: "swagger_server.controllers.pet_controller"
-      x-is-get-method: true
   /pet/findByTags:
     get:
       tags:
@@ -166,7 +163,6 @@ paths:
         - "read:pets"
       deprecated: true
       x-swagger-router-controller: "swagger_server.controllers.pet_controller"
-      x-is-get-method: true
   /pet/{petId}:
     get:
       tags:
@@ -196,7 +192,6 @@ paths:
       security:
       - api_key: []
       x-swagger-router-controller: "swagger_server.controllers.pet_controller"
-      x-is-get-method: true
     post:
       tags:
       - "pet"
@@ -233,7 +228,6 @@ paths:
         - "write:pets"
         - "read:pets"
       x-swagger-router-controller: "swagger_server.controllers.pet_controller"
-      x-is-post-method: true
     delete:
       tags:
       - "pet"
@@ -262,7 +256,6 @@ paths:
         - "write:pets"
         - "read:pets"
       x-swagger-router-controller: "swagger_server.controllers.pet_controller"
-      x-is-delete-method: true
   /pet/{petId}/uploadImage:
     post:
       tags:
@@ -301,7 +294,6 @@ paths:
         - "write:pets"
         - "read:pets"
       x-swagger-router-controller: "swagger_server.controllers.pet_controller"
-      x-is-post-method: true
   /store/inventory:
     get:
       tags:
@@ -323,7 +315,6 @@ paths:
       security:
       - api_key: []
       x-swagger-router-controller: "swagger_server.controllers.store_controller"
-      x-is-get-method: true
   /store/order:
     post:
       tags:
@@ -349,7 +340,6 @@ paths:
         400:
           description: "Invalid Order"
       x-swagger-router-controller: "swagger_server.controllers.store_controller"
-      x-is-post-method: true
   /store/order/{orderId}:
     get:
       tags:
@@ -380,7 +370,6 @@ paths:
         404:
           description: "Order not found"
       x-swagger-router-controller: "swagger_server.controllers.store_controller"
-      x-is-get-method: true
     delete:
       tags:
       - "store"
@@ -403,7 +392,6 @@ paths:
         404:
           description: "Order not found"
       x-swagger-router-controller: "swagger_server.controllers.store_controller"
-      x-is-delete-method: true
   /user:
     post:
       tags:
@@ -425,7 +413,6 @@ paths:
         default:
           description: "successful operation"
       x-swagger-router-controller: "swagger_server.controllers.user_controller"
-      x-is-post-method: true
   /user/createWithArray:
     post:
       tags:
@@ -449,7 +436,6 @@ paths:
         default:
           description: "successful operation"
       x-swagger-router-controller: "swagger_server.controllers.user_controller"
-      x-is-post-method: true
   /user/createWithList:
     post:
       tags:
@@ -473,7 +459,6 @@ paths:
         default:
           description: "successful operation"
       x-swagger-router-controller: "swagger_server.controllers.user_controller"
-      x-is-post-method: true
   /user/login:
     get:
       tags:
@@ -512,7 +497,6 @@ paths:
         400:
           description: "Invalid username/password supplied"
       x-swagger-router-controller: "swagger_server.controllers.user_controller"
-      x-is-get-method: true
   /user/logout:
     get:
       tags:
@@ -528,7 +512,6 @@ paths:
         default:
           description: "successful operation"
       x-swagger-router-controller: "swagger_server.controllers.user_controller"
-      x-is-get-method: true
   /user/{username}:
     get:
       tags:
@@ -555,7 +538,6 @@ paths:
         404:
           description: "User not found"
       x-swagger-router-controller: "swagger_server.controllers.user_controller"
-      x-is-get-method: true
     put:
       tags:
       - "user"
@@ -583,7 +565,6 @@ paths:
         404:
           description: "User not found"
       x-swagger-router-controller: "swagger_server.controllers.user_controller"
-      x-is-put-method: true
     delete:
       tags:
       - "user"
@@ -605,7 +586,6 @@ paths:
         404:
           description: "User not found"
       x-swagger-router-controller: "swagger_server.controllers.user_controller"
-      x-is-delete-method: true
 securityDefinitions:
   petstore_auth:
     type: "oauth2"

From 4af794b07275bbb10ce2807102639c479298bb87 Mon Sep 17 00:00:00 2001
From: Hugo Mercado <hugo.mario.mercado@gmail.com>
Date: Tue, 3 Sep 2019 16:21:09 -0500
Subject: [PATCH 6/9] removed no defined parebt

---
 .../swagger-codegen/src/main/resources/python/model.mustache    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/swagger-codegen/src/main/resources/python/model.mustache b/modules/swagger-codegen/src/main/resources/python/model.mustache
index ef47cf50dc0..7e537eccde8 100644
--- a/modules/swagger-codegen/src/main/resources/python/model.mustache
+++ b/modules/swagger-codegen/src/main/resources/python/model.mustache
@@ -9,7 +9,7 @@ import six
 
 {{#models}}
 {{#model}}
-class {{classname}}({{#parent}}{{parent}}{{/parent}}{{^parent}}object{{/parent}}):
+class {{classname}}(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
     Do not edit the class manually.

From 089d0794c30823068d6311f7aed55ed6c85789ca Mon Sep 17 00:00:00 2001
From: Hugo Mercado <hugo.mario.mercado@gmail.com>
Date: Tue, 3 Sep 2019 16:39:59 -0500
Subject: [PATCH 7/9] updated python samples

---
 pom.xml                                       | 28 +++++++++----------
 .../python-asyncio/petstore_api/models/cat.py |  2 +-
 .../python-asyncio/petstore_api/models/dog.py |  2 +-
 .../python-tornado/.swagger-codegen/VERSION   |  2 +-
 .../models/additional_properties_class.py     |  1 -
 .../petstore_api/models/animal.py             |  1 -
 .../petstore_api/models/animal_farm.py        |  3 --
 .../petstore_api/models/api_response.py       |  1 -
 .../models/array_of_array_of_number_only.py   |  1 -
 .../models/array_of_number_only.py            |  1 -
 .../petstore_api/models/array_test.py         |  3 --
 .../petstore_api/models/capitalization.py     |  1 -
 .../python-tornado/petstore_api/models/cat.py |  5 +---
 .../petstore_api/models/category.py           |  1 -
 .../petstore_api/models/class_model.py        |  1 -
 .../petstore_api/models/client.py             |  1 -
 .../python-tornado/petstore_api/models/dog.py |  5 +---
 .../petstore_api/models/enum_arrays.py        |  1 -
 .../petstore_api/models/enum_class.py         |  1 -
 .../petstore_api/models/enum_test.py          |  3 --
 .../petstore_api/models/format_test.py        |  1 -
 .../petstore_api/models/has_only_read_only.py |  1 -
 .../petstore_api/models/list.py               |  1 -
 .../petstore_api/models/map_test.py           |  1 -
 ...perties_and_additional_properties_class.py |  3 --
 .../petstore_api/models/model200_response.py  |  1 -
 .../petstore_api/models/model_return.py       |  1 -
 .../petstore_api/models/name.py               |  1 -
 .../petstore_api/models/number_only.py        |  1 -
 .../petstore_api/models/order.py              |  1 -
 .../petstore_api/models/outer_boolean.py      |  1 -
 .../petstore_api/models/outer_composite.py    |  5 ----
 .../petstore_api/models/outer_enum.py         |  1 -
 .../petstore_api/models/outer_number.py       |  1 -
 .../petstore_api/models/outer_string.py       |  1 -
 .../python-tornado/petstore_api/models/pet.py |  4 ---
 .../petstore_api/models/read_only_first.py    |  1 -
 .../petstore_api/models/special_model_name.py |  1 -
 .../python-tornado/petstore_api/models/tag.py |  1 -
 .../petstore_api/models/user.py               |  1 -
 .../python/petstore_api/models/cat.py         |  2 +-
 .../python/petstore_api/models/dog.py         |  2 +-
 42 files changed, 21 insertions(+), 76 deletions(-)

diff --git a/pom.xml b/pom.xml
index cca6451af6d..4c01a853ad8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -839,28 +839,28 @@
             <modules>
                 <!-- <module>samples/server/petstore/erlang-server</module> note: make sample compilation work -->
                 <!-- clients -->
-                <module>samples/client/petstore/php/SwaggerClient-php</module>
-                <module>samples/client/petstore/ruby</module>
-                <module>samples/client/petstore/scala</module>
-                <module>samples/client/petstore/akka-scala</module>
-                <module>samples/client/petstore/javascript</module>
+                <!--<module>samples/client/petstore/php/SwaggerClient-php</module>-->
+                <!--<module>samples/client/petstore/ruby</module>-->
+                <!--<module>samples/client/petstore/scala</module>-->
+                <!--<module>samples/client/petstore/akka-scala</module>-->
+                <!--<module>samples/client/petstore/javascript</module>-->
                 <module>samples/client/petstore/python</module>
                 <!--<module>samples/client/petstore/python-tornado</module>-->
                 <module>samples/client/petstore/python-asyncio</module>
-                <module>samples/client/petstore/typescript-fetch/builds/default</module>
-                <module>samples/client/petstore/typescript-fetch/builds/es6-target</module>
-                <module>samples/client/petstore/typescript-fetch/builds/with-npm-version</module>
-                <module>samples/client/petstore/typescript-fetch/tests/default</module>
-                <module>samples/client/petstore/typescript-node/npm</module>
+                <!--<module>samples/client/petstore/typescript-fetch/builds/default</module>-->
+                <!--<module>samples/client/petstore/typescript-fetch/builds/es6-target</module>-->
+                <!--<module>samples/client/petstore/typescript-fetch/builds/with-npm-version</module>-->
+                <!--<module>samples/client/petstore/typescript-fetch/tests/default</module>-->
+                <!--<module>samples/client/petstore/typescript-node/npm</module>-->
                 <!-- comment out due to github rate limit error
                 <module>samples/client/petstore/typescript-angularjs</module>-->
                 <!-- comment out due to error `npm run build`
                 <module>samples/client/petstore/typescript-jquery/npm</module>-->
                 <!--<module>samples/client/petstore/typescript-angular-v2/npm</module>-->
-                <module>samples/client/petstore/typescript-angular-v4/npm</module>
-                <module>samples/client/petstore/typescript-angular-v4.3/npm</module>
-                <module>samples/client/petstore/typescript-angular-v5/npm</module>
-                <module>samples/client/petstore/typescript-angular-v6/npm</module>
+                <!--<module>samples/client/petstore/typescript-angular-v4/npm</module>-->
+                <!--<module>samples/client/petstore/typescript-angular-v4.3/npm</module>-->
+                <!--<module>samples/client/petstore/typescript-angular-v5/npm</module>-->
+                <!--<module>samples/client/petstore/typescript-angular-v6/npm</module>-->
                 <!--<module>samples/client/petstore/bash</module>-->
             </modules>
         </profile>
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/cat.py b/samples/client/petstore/python-asyncio/petstore_api/models/cat.py
index 041b42777ff..96f407e84ba 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/cat.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/cat.py
@@ -16,7 +16,7 @@
 
 import six
 
-class Cat(Animal):
+class Cat(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
     Do not edit the class manually.
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/dog.py b/samples/client/petstore/python-asyncio/petstore_api/models/dog.py
index 940d9c72806..8190304f62b 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/dog.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/dog.py
@@ -16,7 +16,7 @@
 
 import six
 
-class Dog(Animal):
+class Dog(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
     Do not edit the class manually.
diff --git a/samples/client/petstore/python-tornado/.swagger-codegen/VERSION b/samples/client/petstore/python-tornado/.swagger-codegen/VERSION
index 017674fb59d..bba5a87afd0 100644
--- a/samples/client/petstore/python-tornado/.swagger-codegen/VERSION
+++ b/samples/client/petstore/python-tornado/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.4.3-SNAPSHOT
\ No newline at end of file
+2.4.9-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/additional_properties_class.py b/samples/client/petstore/python-tornado/petstore_api/models/additional_properties_class.py
index 83de7092668..63bc21e2807 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/additional_properties_class.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/additional_properties_class.py
@@ -16,7 +16,6 @@
 
 import six
 
-
 class AdditionalPropertiesClass(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/animal.py b/samples/client/petstore/python-tornado/petstore_api/models/animal.py
index 5175148b2d3..d5a562fae8e 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/animal.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/animal.py
@@ -16,7 +16,6 @@
 
 import six
 
-
 class Animal(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/animal_farm.py b/samples/client/petstore/python-tornado/petstore_api/models/animal_farm.py
index e7904d7fbf6..6231d5e2997 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/animal_farm.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/animal_farm.py
@@ -16,9 +16,6 @@
 
 import six
 
-from petstore_api.models.animal import Animal  # noqa: F401,E501
-
-
 class AnimalFarm(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/api_response.py b/samples/client/petstore/python-tornado/petstore_api/models/api_response.py
index 9da53da373b..200925dcc94 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/api_response.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/api_response.py
@@ -16,7 +16,6 @@
 
 import six
 
-
 class ApiResponse(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/array_of_array_of_number_only.py b/samples/client/petstore/python-tornado/petstore_api/models/array_of_array_of_number_only.py
index 1e5e8be1ed1..9906156e821 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/array_of_array_of_number_only.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/array_of_array_of_number_only.py
@@ -16,7 +16,6 @@
 
 import six
 
-
 class ArrayOfArrayOfNumberOnly(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/array_of_number_only.py b/samples/client/petstore/python-tornado/petstore_api/models/array_of_number_only.py
index 0628f7af1e7..646bd4393c5 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/array_of_number_only.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/array_of_number_only.py
@@ -16,7 +16,6 @@
 
 import six
 
-
 class ArrayOfNumberOnly(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/array_test.py b/samples/client/petstore/python-tornado/petstore_api/models/array_test.py
index aa2d0d5e633..2f1a6c51e2a 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/array_test.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/array_test.py
@@ -16,9 +16,6 @@
 
 import six
 
-from petstore_api.models.read_only_first import ReadOnlyFirst  # noqa: F401,E501
-
-
 class ArrayTest(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/capitalization.py b/samples/client/petstore/python-tornado/petstore_api/models/capitalization.py
index 83b0068aee2..05abe9956bd 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/capitalization.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/capitalization.py
@@ -16,7 +16,6 @@
 
 import six
 
-
 class Capitalization(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/cat.py b/samples/client/petstore/python-tornado/petstore_api/models/cat.py
index 3660f18706b..96f407e84ba 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/cat.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/cat.py
@@ -16,10 +16,7 @@
 
 import six
 
-from petstore_api.models.animal import Animal  # noqa: F401,E501
-
-
-class Cat(Animal):
+class Cat(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
     Do not edit the class manually.
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/category.py b/samples/client/petstore/python-tornado/petstore_api/models/category.py
index dbc4fd28816..42b3a25d9fd 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/category.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/category.py
@@ -16,7 +16,6 @@
 
 import six
 
-
 class Category(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/class_model.py b/samples/client/petstore/python-tornado/petstore_api/models/class_model.py
index 6042036beb5..851bd07170f 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/class_model.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/class_model.py
@@ -16,7 +16,6 @@
 
 import six
 
-
 class ClassModel(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/client.py b/samples/client/petstore/python-tornado/petstore_api/models/client.py
index 337100c3946..6ec6aa466c8 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/client.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/client.py
@@ -16,7 +16,6 @@
 
 import six
 
-
 class Client(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/dog.py b/samples/client/petstore/python-tornado/petstore_api/models/dog.py
index 3d80d6442f4..8190304f62b 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/dog.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/dog.py
@@ -16,10 +16,7 @@
 
 import six
 
-from petstore_api.models.animal import Animal  # noqa: F401,E501
-
-
-class Dog(Animal):
+class Dog(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
     Do not edit the class manually.
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/enum_arrays.py b/samples/client/petstore/python-tornado/petstore_api/models/enum_arrays.py
index 5257b181b88..4ded72ab35c 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/enum_arrays.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/enum_arrays.py
@@ -16,7 +16,6 @@
 
 import six
 
-
 class EnumArrays(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/enum_class.py b/samples/client/petstore/python-tornado/petstore_api/models/enum_class.py
index 2282270dda1..55ead16cfdd 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/enum_class.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/enum_class.py
@@ -16,7 +16,6 @@
 
 import six
 
-
 class EnumClass(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/enum_test.py b/samples/client/petstore/python-tornado/petstore_api/models/enum_test.py
index d977ef918bc..d56e6c54484 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/enum_test.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/enum_test.py
@@ -16,9 +16,6 @@
 
 import six
 
-from petstore_api.models.outer_enum import OuterEnum  # noqa: F401,E501
-
-
 class EnumTest(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/format_test.py b/samples/client/petstore/python-tornado/petstore_api/models/format_test.py
index 206b991719d..a9a05c023ce 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/format_test.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/format_test.py
@@ -16,7 +16,6 @@
 
 import six
 
-
 class FormatTest(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/has_only_read_only.py b/samples/client/petstore/python-tornado/petstore_api/models/has_only_read_only.py
index 76e5ceb1e22..44763cc757d 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/has_only_read_only.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/has_only_read_only.py
@@ -16,7 +16,6 @@
 
 import six
 
-
 class HasOnlyReadOnly(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/list.py b/samples/client/petstore/python-tornado/petstore_api/models/list.py
index 46eef1e90f3..d87f84250dd 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/list.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/list.py
@@ -16,7 +16,6 @@
 
 import six
 
-
 class List(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/map_test.py b/samples/client/petstore/python-tornado/petstore_api/models/map_test.py
index f2633c30a99..e04bbdb5c6b 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/map_test.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/map_test.py
@@ -16,7 +16,6 @@
 
 import six
 
-
 class MapTest(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/mixed_properties_and_additional_properties_class.py b/samples/client/petstore/python-tornado/petstore_api/models/mixed_properties_and_additional_properties_class.py
index dfed6cc90bd..213def41e7a 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/mixed_properties_and_additional_properties_class.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/mixed_properties_and_additional_properties_class.py
@@ -16,9 +16,6 @@
 
 import six
 
-from petstore_api.models.animal import Animal  # noqa: F401,E501
-
-
 class MixedPropertiesAndAdditionalPropertiesClass(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/model200_response.py b/samples/client/petstore/python-tornado/petstore_api/models/model200_response.py
index 1fcaabca10e..a23e44d27e7 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/model200_response.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/model200_response.py
@@ -16,7 +16,6 @@
 
 import six
 
-
 class Model200Response(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/model_return.py b/samples/client/petstore/python-tornado/petstore_api/models/model_return.py
index 79253611495..d500dfde2b5 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/model_return.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/model_return.py
@@ -16,7 +16,6 @@
 
 import six
 
-
 class ModelReturn(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/name.py b/samples/client/petstore/python-tornado/petstore_api/models/name.py
index 53be7953ea9..32278ab3a99 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/name.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/name.py
@@ -16,7 +16,6 @@
 
 import six
 
-
 class Name(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/number_only.py b/samples/client/petstore/python-tornado/petstore_api/models/number_only.py
index 2f43a834f8b..08a43e9e85f 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/number_only.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/number_only.py
@@ -16,7 +16,6 @@
 
 import six
 
-
 class NumberOnly(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/order.py b/samples/client/petstore/python-tornado/petstore_api/models/order.py
index 9291652787e..f1357a920df 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/order.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/order.py
@@ -16,7 +16,6 @@
 
 import six
 
-
 class Order(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/outer_boolean.py b/samples/client/petstore/python-tornado/petstore_api/models/outer_boolean.py
index 3b273333e75..5b3066c2d35 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/outer_boolean.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/outer_boolean.py
@@ -16,7 +16,6 @@
 
 import six
 
-
 class OuterBoolean(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/outer_composite.py b/samples/client/petstore/python-tornado/petstore_api/models/outer_composite.py
index 36381acb861..3d3be1a3801 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/outer_composite.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/outer_composite.py
@@ -16,11 +16,6 @@
 
 import six
 
-from petstore_api.models.outer_boolean import OuterBoolean  # noqa: F401,E501
-from petstore_api.models.outer_number import OuterNumber  # noqa: F401,E501
-from petstore_api.models.outer_string import OuterString  # noqa: F401,E501
-
-
 class OuterComposite(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/outer_enum.py b/samples/client/petstore/python-tornado/petstore_api/models/outer_enum.py
index bea07410cf2..b48ab7dfb6a 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/outer_enum.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/outer_enum.py
@@ -16,7 +16,6 @@
 
 import six
 
-
 class OuterEnum(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/outer_number.py b/samples/client/petstore/python-tornado/petstore_api/models/outer_number.py
index a60e97c8288..048ad15312e 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/outer_number.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/outer_number.py
@@ -16,7 +16,6 @@
 
 import six
 
-
 class OuterNumber(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/outer_string.py b/samples/client/petstore/python-tornado/petstore_api/models/outer_string.py
index 622589ce2f6..f116ff52d9c 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/outer_string.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/outer_string.py
@@ -16,7 +16,6 @@
 
 import six
 
-
 class OuterString(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/pet.py b/samples/client/petstore/python-tornado/petstore_api/models/pet.py
index c7c206c7a93..e33d76de6c5 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/pet.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/pet.py
@@ -16,10 +16,6 @@
 
 import six
 
-from petstore_api.models.category import Category  # noqa: F401,E501
-from petstore_api.models.tag import Tag  # noqa: F401,E501
-
-
 class Pet(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/read_only_first.py b/samples/client/petstore/python-tornado/petstore_api/models/read_only_first.py
index 0a378f93da6..62d38b61c69 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/read_only_first.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/read_only_first.py
@@ -16,7 +16,6 @@
 
 import six
 
-
 class ReadOnlyFirst(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/special_model_name.py b/samples/client/petstore/python-tornado/petstore_api/models/special_model_name.py
index 3817430b656..23603b09349 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/special_model_name.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/special_model_name.py
@@ -16,7 +16,6 @@
 
 import six
 
-
 class SpecialModelName(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/tag.py b/samples/client/petstore/python-tornado/petstore_api/models/tag.py
index dc3c0b5645f..470d9082dd9 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/tag.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/tag.py
@@ -16,7 +16,6 @@
 
 import six
 
-
 class Tag(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/user.py b/samples/client/petstore/python-tornado/petstore_api/models/user.py
index 8dcac91845f..57bd119538d 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/user.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/user.py
@@ -16,7 +16,6 @@
 
 import six
 
-
 class User(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python/petstore_api/models/cat.py b/samples/client/petstore/python/petstore_api/models/cat.py
index 041b42777ff..96f407e84ba 100644
--- a/samples/client/petstore/python/petstore_api/models/cat.py
+++ b/samples/client/petstore/python/petstore_api/models/cat.py
@@ -16,7 +16,7 @@
 
 import six
 
-class Cat(Animal):
+class Cat(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
     Do not edit the class manually.
diff --git a/samples/client/petstore/python/petstore_api/models/dog.py b/samples/client/petstore/python/petstore_api/models/dog.py
index 940d9c72806..8190304f62b 100644
--- a/samples/client/petstore/python/petstore_api/models/dog.py
+++ b/samples/client/petstore/python/petstore_api/models/dog.py
@@ -16,7 +16,7 @@
 
 import six
 
-class Dog(Animal):
+class Dog(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
     Do not edit the class manually.

From 2765d61b102c877ae5d35de407603732dc28c342 Mon Sep 17 00:00:00 2001
From: Hugo Mercado <hugo.mario.mercado@gmail.com>
Date: Tue, 3 Sep 2019 16:59:20 -0500
Subject: [PATCH 8/9] Revert "updated python samples"

This reverts commit 089d0794c30823068d6311f7aed55ed6c85789ca.
---
 pom.xml                                       | 28 +++++++++----------
 .../python-asyncio/petstore_api/models/cat.py |  2 +-
 .../python-asyncio/petstore_api/models/dog.py |  2 +-
 .../python-tornado/.swagger-codegen/VERSION   |  2 +-
 .../models/additional_properties_class.py     |  1 +
 .../petstore_api/models/animal.py             |  1 +
 .../petstore_api/models/animal_farm.py        |  3 ++
 .../petstore_api/models/api_response.py       |  1 +
 .../models/array_of_array_of_number_only.py   |  1 +
 .../models/array_of_number_only.py            |  1 +
 .../petstore_api/models/array_test.py         |  3 ++
 .../petstore_api/models/capitalization.py     |  1 +
 .../python-tornado/petstore_api/models/cat.py |  5 +++-
 .../petstore_api/models/category.py           |  1 +
 .../petstore_api/models/class_model.py        |  1 +
 .../petstore_api/models/client.py             |  1 +
 .../python-tornado/petstore_api/models/dog.py |  5 +++-
 .../petstore_api/models/enum_arrays.py        |  1 +
 .../petstore_api/models/enum_class.py         |  1 +
 .../petstore_api/models/enum_test.py          |  3 ++
 .../petstore_api/models/format_test.py        |  1 +
 .../petstore_api/models/has_only_read_only.py |  1 +
 .../petstore_api/models/list.py               |  1 +
 .../petstore_api/models/map_test.py           |  1 +
 ...perties_and_additional_properties_class.py |  3 ++
 .../petstore_api/models/model200_response.py  |  1 +
 .../petstore_api/models/model_return.py       |  1 +
 .../petstore_api/models/name.py               |  1 +
 .../petstore_api/models/number_only.py        |  1 +
 .../petstore_api/models/order.py              |  1 +
 .../petstore_api/models/outer_boolean.py      |  1 +
 .../petstore_api/models/outer_composite.py    |  5 ++++
 .../petstore_api/models/outer_enum.py         |  1 +
 .../petstore_api/models/outer_number.py       |  1 +
 .../petstore_api/models/outer_string.py       |  1 +
 .../python-tornado/petstore_api/models/pet.py |  4 +++
 .../petstore_api/models/read_only_first.py    |  1 +
 .../petstore_api/models/special_model_name.py |  1 +
 .../python-tornado/petstore_api/models/tag.py |  1 +
 .../petstore_api/models/user.py               |  1 +
 .../python/petstore_api/models/cat.py         |  2 +-
 .../python/petstore_api/models/dog.py         |  2 +-
 42 files changed, 76 insertions(+), 21 deletions(-)

diff --git a/pom.xml b/pom.xml
index 4c01a853ad8..cca6451af6d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -839,28 +839,28 @@
             <modules>
                 <!-- <module>samples/server/petstore/erlang-server</module> note: make sample compilation work -->
                 <!-- clients -->
-                <!--<module>samples/client/petstore/php/SwaggerClient-php</module>-->
-                <!--<module>samples/client/petstore/ruby</module>-->
-                <!--<module>samples/client/petstore/scala</module>-->
-                <!--<module>samples/client/petstore/akka-scala</module>-->
-                <!--<module>samples/client/petstore/javascript</module>-->
+                <module>samples/client/petstore/php/SwaggerClient-php</module>
+                <module>samples/client/petstore/ruby</module>
+                <module>samples/client/petstore/scala</module>
+                <module>samples/client/petstore/akka-scala</module>
+                <module>samples/client/petstore/javascript</module>
                 <module>samples/client/petstore/python</module>
                 <!--<module>samples/client/petstore/python-tornado</module>-->
                 <module>samples/client/petstore/python-asyncio</module>
-                <!--<module>samples/client/petstore/typescript-fetch/builds/default</module>-->
-                <!--<module>samples/client/petstore/typescript-fetch/builds/es6-target</module>-->
-                <!--<module>samples/client/petstore/typescript-fetch/builds/with-npm-version</module>-->
-                <!--<module>samples/client/petstore/typescript-fetch/tests/default</module>-->
-                <!--<module>samples/client/petstore/typescript-node/npm</module>-->
+                <module>samples/client/petstore/typescript-fetch/builds/default</module>
+                <module>samples/client/petstore/typescript-fetch/builds/es6-target</module>
+                <module>samples/client/petstore/typescript-fetch/builds/with-npm-version</module>
+                <module>samples/client/petstore/typescript-fetch/tests/default</module>
+                <module>samples/client/petstore/typescript-node/npm</module>
                 <!-- comment out due to github rate limit error
                 <module>samples/client/petstore/typescript-angularjs</module>-->
                 <!-- comment out due to error `npm run build`
                 <module>samples/client/petstore/typescript-jquery/npm</module>-->
                 <!--<module>samples/client/petstore/typescript-angular-v2/npm</module>-->
-                <!--<module>samples/client/petstore/typescript-angular-v4/npm</module>-->
-                <!--<module>samples/client/petstore/typescript-angular-v4.3/npm</module>-->
-                <!--<module>samples/client/petstore/typescript-angular-v5/npm</module>-->
-                <!--<module>samples/client/petstore/typescript-angular-v6/npm</module>-->
+                <module>samples/client/petstore/typescript-angular-v4/npm</module>
+                <module>samples/client/petstore/typescript-angular-v4.3/npm</module>
+                <module>samples/client/petstore/typescript-angular-v5/npm</module>
+                <module>samples/client/petstore/typescript-angular-v6/npm</module>
                 <!--<module>samples/client/petstore/bash</module>-->
             </modules>
         </profile>
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/cat.py b/samples/client/petstore/python-asyncio/petstore_api/models/cat.py
index 96f407e84ba..041b42777ff 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/cat.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/cat.py
@@ -16,7 +16,7 @@
 
 import six
 
-class Cat(object):
+class Cat(Animal):
     """NOTE: This class is auto generated by the swagger code generator program.
 
     Do not edit the class manually.
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/dog.py b/samples/client/petstore/python-asyncio/petstore_api/models/dog.py
index 8190304f62b..940d9c72806 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/dog.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/dog.py
@@ -16,7 +16,7 @@
 
 import six
 
-class Dog(object):
+class Dog(Animal):
     """NOTE: This class is auto generated by the swagger code generator program.
 
     Do not edit the class manually.
diff --git a/samples/client/petstore/python-tornado/.swagger-codegen/VERSION b/samples/client/petstore/python-tornado/.swagger-codegen/VERSION
index bba5a87afd0..017674fb59d 100644
--- a/samples/client/petstore/python-tornado/.swagger-codegen/VERSION
+++ b/samples/client/petstore/python-tornado/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.4.9-SNAPSHOT
\ No newline at end of file
+2.4.3-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/additional_properties_class.py b/samples/client/petstore/python-tornado/petstore_api/models/additional_properties_class.py
index 63bc21e2807..83de7092668 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/additional_properties_class.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/additional_properties_class.py
@@ -16,6 +16,7 @@
 
 import six
 
+
 class AdditionalPropertiesClass(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/animal.py b/samples/client/petstore/python-tornado/petstore_api/models/animal.py
index d5a562fae8e..5175148b2d3 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/animal.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/animal.py
@@ -16,6 +16,7 @@
 
 import six
 
+
 class Animal(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/animal_farm.py b/samples/client/petstore/python-tornado/petstore_api/models/animal_farm.py
index 6231d5e2997..e7904d7fbf6 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/animal_farm.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/animal_farm.py
@@ -16,6 +16,9 @@
 
 import six
 
+from petstore_api.models.animal import Animal  # noqa: F401,E501
+
+
 class AnimalFarm(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/api_response.py b/samples/client/petstore/python-tornado/petstore_api/models/api_response.py
index 200925dcc94..9da53da373b 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/api_response.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/api_response.py
@@ -16,6 +16,7 @@
 
 import six
 
+
 class ApiResponse(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/array_of_array_of_number_only.py b/samples/client/petstore/python-tornado/petstore_api/models/array_of_array_of_number_only.py
index 9906156e821..1e5e8be1ed1 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/array_of_array_of_number_only.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/array_of_array_of_number_only.py
@@ -16,6 +16,7 @@
 
 import six
 
+
 class ArrayOfArrayOfNumberOnly(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/array_of_number_only.py b/samples/client/petstore/python-tornado/petstore_api/models/array_of_number_only.py
index 646bd4393c5..0628f7af1e7 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/array_of_number_only.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/array_of_number_only.py
@@ -16,6 +16,7 @@
 
 import six
 
+
 class ArrayOfNumberOnly(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/array_test.py b/samples/client/petstore/python-tornado/petstore_api/models/array_test.py
index 2f1a6c51e2a..aa2d0d5e633 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/array_test.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/array_test.py
@@ -16,6 +16,9 @@
 
 import six
 
+from petstore_api.models.read_only_first import ReadOnlyFirst  # noqa: F401,E501
+
+
 class ArrayTest(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/capitalization.py b/samples/client/petstore/python-tornado/petstore_api/models/capitalization.py
index 05abe9956bd..83b0068aee2 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/capitalization.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/capitalization.py
@@ -16,6 +16,7 @@
 
 import six
 
+
 class Capitalization(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/cat.py b/samples/client/petstore/python-tornado/petstore_api/models/cat.py
index 96f407e84ba..3660f18706b 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/cat.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/cat.py
@@ -16,7 +16,10 @@
 
 import six
 
-class Cat(object):
+from petstore_api.models.animal import Animal  # noqa: F401,E501
+
+
+class Cat(Animal):
     """NOTE: This class is auto generated by the swagger code generator program.
 
     Do not edit the class manually.
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/category.py b/samples/client/petstore/python-tornado/petstore_api/models/category.py
index 42b3a25d9fd..dbc4fd28816 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/category.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/category.py
@@ -16,6 +16,7 @@
 
 import six
 
+
 class Category(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/class_model.py b/samples/client/petstore/python-tornado/petstore_api/models/class_model.py
index 851bd07170f..6042036beb5 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/class_model.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/class_model.py
@@ -16,6 +16,7 @@
 
 import six
 
+
 class ClassModel(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/client.py b/samples/client/petstore/python-tornado/petstore_api/models/client.py
index 6ec6aa466c8..337100c3946 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/client.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/client.py
@@ -16,6 +16,7 @@
 
 import six
 
+
 class Client(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/dog.py b/samples/client/petstore/python-tornado/petstore_api/models/dog.py
index 8190304f62b..3d80d6442f4 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/dog.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/dog.py
@@ -16,7 +16,10 @@
 
 import six
 
-class Dog(object):
+from petstore_api.models.animal import Animal  # noqa: F401,E501
+
+
+class Dog(Animal):
     """NOTE: This class is auto generated by the swagger code generator program.
 
     Do not edit the class manually.
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/enum_arrays.py b/samples/client/petstore/python-tornado/petstore_api/models/enum_arrays.py
index 4ded72ab35c..5257b181b88 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/enum_arrays.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/enum_arrays.py
@@ -16,6 +16,7 @@
 
 import six
 
+
 class EnumArrays(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/enum_class.py b/samples/client/petstore/python-tornado/petstore_api/models/enum_class.py
index 55ead16cfdd..2282270dda1 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/enum_class.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/enum_class.py
@@ -16,6 +16,7 @@
 
 import six
 
+
 class EnumClass(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/enum_test.py b/samples/client/petstore/python-tornado/petstore_api/models/enum_test.py
index d56e6c54484..d977ef918bc 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/enum_test.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/enum_test.py
@@ -16,6 +16,9 @@
 
 import six
 
+from petstore_api.models.outer_enum import OuterEnum  # noqa: F401,E501
+
+
 class EnumTest(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/format_test.py b/samples/client/petstore/python-tornado/petstore_api/models/format_test.py
index a9a05c023ce..206b991719d 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/format_test.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/format_test.py
@@ -16,6 +16,7 @@
 
 import six
 
+
 class FormatTest(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/has_only_read_only.py b/samples/client/petstore/python-tornado/petstore_api/models/has_only_read_only.py
index 44763cc757d..76e5ceb1e22 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/has_only_read_only.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/has_only_read_only.py
@@ -16,6 +16,7 @@
 
 import six
 
+
 class HasOnlyReadOnly(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/list.py b/samples/client/petstore/python-tornado/petstore_api/models/list.py
index d87f84250dd..46eef1e90f3 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/list.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/list.py
@@ -16,6 +16,7 @@
 
 import six
 
+
 class List(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/map_test.py b/samples/client/petstore/python-tornado/petstore_api/models/map_test.py
index e04bbdb5c6b..f2633c30a99 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/map_test.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/map_test.py
@@ -16,6 +16,7 @@
 
 import six
 
+
 class MapTest(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/mixed_properties_and_additional_properties_class.py b/samples/client/petstore/python-tornado/petstore_api/models/mixed_properties_and_additional_properties_class.py
index 213def41e7a..dfed6cc90bd 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/mixed_properties_and_additional_properties_class.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/mixed_properties_and_additional_properties_class.py
@@ -16,6 +16,9 @@
 
 import six
 
+from petstore_api.models.animal import Animal  # noqa: F401,E501
+
+
 class MixedPropertiesAndAdditionalPropertiesClass(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/model200_response.py b/samples/client/petstore/python-tornado/petstore_api/models/model200_response.py
index a23e44d27e7..1fcaabca10e 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/model200_response.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/model200_response.py
@@ -16,6 +16,7 @@
 
 import six
 
+
 class Model200Response(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/model_return.py b/samples/client/petstore/python-tornado/petstore_api/models/model_return.py
index d500dfde2b5..79253611495 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/model_return.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/model_return.py
@@ -16,6 +16,7 @@
 
 import six
 
+
 class ModelReturn(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/name.py b/samples/client/petstore/python-tornado/petstore_api/models/name.py
index 32278ab3a99..53be7953ea9 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/name.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/name.py
@@ -16,6 +16,7 @@
 
 import six
 
+
 class Name(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/number_only.py b/samples/client/petstore/python-tornado/petstore_api/models/number_only.py
index 08a43e9e85f..2f43a834f8b 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/number_only.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/number_only.py
@@ -16,6 +16,7 @@
 
 import six
 
+
 class NumberOnly(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/order.py b/samples/client/petstore/python-tornado/petstore_api/models/order.py
index f1357a920df..9291652787e 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/order.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/order.py
@@ -16,6 +16,7 @@
 
 import six
 
+
 class Order(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/outer_boolean.py b/samples/client/petstore/python-tornado/petstore_api/models/outer_boolean.py
index 5b3066c2d35..3b273333e75 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/outer_boolean.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/outer_boolean.py
@@ -16,6 +16,7 @@
 
 import six
 
+
 class OuterBoolean(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/outer_composite.py b/samples/client/petstore/python-tornado/petstore_api/models/outer_composite.py
index 3d3be1a3801..36381acb861 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/outer_composite.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/outer_composite.py
@@ -16,6 +16,11 @@
 
 import six
 
+from petstore_api.models.outer_boolean import OuterBoolean  # noqa: F401,E501
+from petstore_api.models.outer_number import OuterNumber  # noqa: F401,E501
+from petstore_api.models.outer_string import OuterString  # noqa: F401,E501
+
+
 class OuterComposite(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/outer_enum.py b/samples/client/petstore/python-tornado/petstore_api/models/outer_enum.py
index b48ab7dfb6a..bea07410cf2 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/outer_enum.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/outer_enum.py
@@ -16,6 +16,7 @@
 
 import six
 
+
 class OuterEnum(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/outer_number.py b/samples/client/petstore/python-tornado/petstore_api/models/outer_number.py
index 048ad15312e..a60e97c8288 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/outer_number.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/outer_number.py
@@ -16,6 +16,7 @@
 
 import six
 
+
 class OuterNumber(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/outer_string.py b/samples/client/petstore/python-tornado/petstore_api/models/outer_string.py
index f116ff52d9c..622589ce2f6 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/outer_string.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/outer_string.py
@@ -16,6 +16,7 @@
 
 import six
 
+
 class OuterString(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/pet.py b/samples/client/petstore/python-tornado/petstore_api/models/pet.py
index e33d76de6c5..c7c206c7a93 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/pet.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/pet.py
@@ -16,6 +16,10 @@
 
 import six
 
+from petstore_api.models.category import Category  # noqa: F401,E501
+from petstore_api.models.tag import Tag  # noqa: F401,E501
+
+
 class Pet(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/read_only_first.py b/samples/client/petstore/python-tornado/petstore_api/models/read_only_first.py
index 62d38b61c69..0a378f93da6 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/read_only_first.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/read_only_first.py
@@ -16,6 +16,7 @@
 
 import six
 
+
 class ReadOnlyFirst(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/special_model_name.py b/samples/client/petstore/python-tornado/petstore_api/models/special_model_name.py
index 23603b09349..3817430b656 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/special_model_name.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/special_model_name.py
@@ -16,6 +16,7 @@
 
 import six
 
+
 class SpecialModelName(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/tag.py b/samples/client/petstore/python-tornado/petstore_api/models/tag.py
index 470d9082dd9..dc3c0b5645f 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/tag.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/tag.py
@@ -16,6 +16,7 @@
 
 import six
 
+
 class Tag(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/user.py b/samples/client/petstore/python-tornado/petstore_api/models/user.py
index 57bd119538d..8dcac91845f 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/user.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/user.py
@@ -16,6 +16,7 @@
 
 import six
 
+
 class User(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python/petstore_api/models/cat.py b/samples/client/petstore/python/petstore_api/models/cat.py
index 96f407e84ba..041b42777ff 100644
--- a/samples/client/petstore/python/petstore_api/models/cat.py
+++ b/samples/client/petstore/python/petstore_api/models/cat.py
@@ -16,7 +16,7 @@
 
 import six
 
-class Cat(object):
+class Cat(Animal):
     """NOTE: This class is auto generated by the swagger code generator program.
 
     Do not edit the class manually.
diff --git a/samples/client/petstore/python/petstore_api/models/dog.py b/samples/client/petstore/python/petstore_api/models/dog.py
index 8190304f62b..940d9c72806 100644
--- a/samples/client/petstore/python/petstore_api/models/dog.py
+++ b/samples/client/petstore/python/petstore_api/models/dog.py
@@ -16,7 +16,7 @@
 
 import six
 
-class Dog(object):
+class Dog(Animal):
     """NOTE: This class is auto generated by the swagger code generator program.
 
     Do not edit the class manually.

From 607cb838d3b428f874bb1618d3fe524e16fe9556 Mon Sep 17 00:00:00 2001
From: Hugo Mercado <hugo.mario.mercado@gmail.com>
Date: Tue, 3 Sep 2019 17:05:55 -0500
Subject: [PATCH 9/9] fixed blank space issue and updated samples

---
 .../swagger-codegen/src/main/resources/python/model.mustache  | 1 +
 .../petstore_api/models/additional_properties_class.py        | 1 +
 .../petstore/python-asyncio/petstore_api/models/animal.py     | 1 +
 .../python-asyncio/petstore_api/models/animal_farm.py         | 1 +
 .../python-asyncio/petstore_api/models/api_response.py        | 1 +
 .../petstore_api/models/array_of_array_of_number_only.py      | 1 +
 .../petstore_api/models/array_of_number_only.py               | 1 +
 .../petstore/python-asyncio/petstore_api/models/array_test.py | 1 +
 .../python-asyncio/petstore_api/models/capitalization.py      | 1 +
 .../client/petstore/python-asyncio/petstore_api/models/cat.py | 3 ++-
 .../petstore/python-asyncio/petstore_api/models/category.py   | 1 +
 .../python-asyncio/petstore_api/models/class_model.py         | 1 +
 .../petstore/python-asyncio/petstore_api/models/client.py     | 1 +
 .../client/petstore/python-asyncio/petstore_api/models/dog.py | 3 ++-
 .../python-asyncio/petstore_api/models/enum_arrays.py         | 1 +
 .../petstore/python-asyncio/petstore_api/models/enum_class.py | 1 +
 .../petstore/python-asyncio/petstore_api/models/enum_test.py  | 1 +
 .../python-asyncio/petstore_api/models/format_test.py         | 1 +
 .../python-asyncio/petstore_api/models/has_only_read_only.py  | 1 +
 .../petstore/python-asyncio/petstore_api/models/list.py       | 1 +
 .../petstore/python-asyncio/petstore_api/models/map_test.py   | 1 +
 .../mixed_properties_and_additional_properties_class.py       | 1 +
 .../python-asyncio/petstore_api/models/model200_response.py   | 1 +
 .../python-asyncio/petstore_api/models/model_return.py        | 1 +
 .../petstore/python-asyncio/petstore_api/models/name.py       | 1 +
 .../python-asyncio/petstore_api/models/number_only.py         | 1 +
 .../petstore/python-asyncio/petstore_api/models/order.py      | 1 +
 .../python-asyncio/petstore_api/models/outer_boolean.py       | 1 +
 .../python-asyncio/petstore_api/models/outer_composite.py     | 1 +
 .../petstore/python-asyncio/petstore_api/models/outer_enum.py | 1 +
 .../python-asyncio/petstore_api/models/outer_number.py        | 1 +
 .../python-asyncio/petstore_api/models/outer_string.py        | 1 +
 .../client/petstore/python-asyncio/petstore_api/models/pet.py | 1 +
 .../python-asyncio/petstore_api/models/read_only_first.py     | 1 +
 .../python-asyncio/petstore_api/models/special_model_name.py  | 1 +
 .../client/petstore/python-asyncio/petstore_api/models/tag.py | 1 +
 .../petstore/python-asyncio/petstore_api/models/user.py       | 1 +
 .../client/petstore/python-tornado/.swagger-codegen/VERSION   | 2 +-
 .../python-tornado/petstore_api/models/animal_farm.py         | 2 --
 .../petstore/python-tornado/petstore_api/models/array_test.py | 2 --
 .../client/petstore/python-tornado/petstore_api/models/cat.py | 4 +---
 .../client/petstore/python-tornado/petstore_api/models/dog.py | 4 +---
 .../petstore/python-tornado/petstore_api/models/enum_test.py  | 2 --
 .../mixed_properties_and_additional_properties_class.py       | 2 --
 .../python-tornado/petstore_api/models/outer_composite.py     | 4 ----
 .../client/petstore/python-tornado/petstore_api/models/pet.py | 3 ---
 .../python/petstore_api/models/additional_properties_class.py | 1 +
 samples/client/petstore/python/petstore_api/models/animal.py  | 1 +
 .../client/petstore/python/petstore_api/models/animal_farm.py | 1 +
 .../petstore/python/petstore_api/models/api_response.py       | 1 +
 .../petstore_api/models/array_of_array_of_number_only.py      | 1 +
 .../python/petstore_api/models/array_of_number_only.py        | 1 +
 .../client/petstore/python/petstore_api/models/array_test.py  | 1 +
 .../petstore/python/petstore_api/models/capitalization.py     | 1 +
 samples/client/petstore/python/petstore_api/models/cat.py     | 3 ++-
 .../client/petstore/python/petstore_api/models/category.py    | 1 +
 .../client/petstore/python/petstore_api/models/class_model.py | 1 +
 samples/client/petstore/python/petstore_api/models/client.py  | 1 +
 samples/client/petstore/python/petstore_api/models/dog.py     | 3 ++-
 .../client/petstore/python/petstore_api/models/enum_arrays.py | 1 +
 .../client/petstore/python/petstore_api/models/enum_class.py  | 1 +
 .../client/petstore/python/petstore_api/models/enum_test.py   | 1 +
 .../client/petstore/python/petstore_api/models/format_test.py | 1 +
 .../petstore/python/petstore_api/models/has_only_read_only.py | 1 +
 samples/client/petstore/python/petstore_api/models/list.py    | 1 +
 .../client/petstore/python/petstore_api/models/map_test.py    | 1 +
 .../mixed_properties_and_additional_properties_class.py       | 1 +
 .../petstore/python/petstore_api/models/model200_response.py  | 1 +
 .../petstore/python/petstore_api/models/model_return.py       | 1 +
 samples/client/petstore/python/petstore_api/models/name.py    | 1 +
 .../client/petstore/python/petstore_api/models/number_only.py | 1 +
 samples/client/petstore/python/petstore_api/models/order.py   | 1 +
 .../petstore/python/petstore_api/models/outer_boolean.py      | 1 +
 .../petstore/python/petstore_api/models/outer_composite.py    | 1 +
 .../client/petstore/python/petstore_api/models/outer_enum.py  | 1 +
 .../petstore/python/petstore_api/models/outer_number.py       | 1 +
 .../petstore/python/petstore_api/models/outer_string.py       | 1 +
 samples/client/petstore/python/petstore_api/models/pet.py     | 1 +
 .../petstore/python/petstore_api/models/read_only_first.py    | 1 +
 .../petstore/python/petstore_api/models/special_model_name.py | 1 +
 samples/client/petstore/python/petstore_api/models/tag.py     | 1 +
 samples/client/petstore/python/petstore_api/models/user.py    | 1 +
 82 files changed, 80 insertions(+), 26 deletions(-)

diff --git a/modules/swagger-codegen/src/main/resources/python/model.mustache b/modules/swagger-codegen/src/main/resources/python/model.mustache
index 7e537eccde8..9b647633f55 100644
--- a/modules/swagger-codegen/src/main/resources/python/model.mustache
+++ b/modules/swagger-codegen/src/main/resources/python/model.mustache
@@ -7,6 +7,7 @@ import re  # noqa: F401
 
 import six
 
+
 {{#models}}
 {{#model}}
 class {{classname}}(object):
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/additional_properties_class.py b/samples/client/petstore/python-asyncio/petstore_api/models/additional_properties_class.py
index 63bc21e2807..83de7092668 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/additional_properties_class.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/additional_properties_class.py
@@ -16,6 +16,7 @@
 
 import six
 
+
 class AdditionalPropertiesClass(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/animal.py b/samples/client/petstore/python-asyncio/petstore_api/models/animal.py
index d5a562fae8e..5175148b2d3 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/animal.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/animal.py
@@ -16,6 +16,7 @@
 
 import six
 
+
 class Animal(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/animal_farm.py b/samples/client/petstore/python-asyncio/petstore_api/models/animal_farm.py
index 6231d5e2997..1df0fb39924 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/animal_farm.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/animal_farm.py
@@ -16,6 +16,7 @@
 
 import six
 
+
 class AnimalFarm(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/api_response.py b/samples/client/petstore/python-asyncio/petstore_api/models/api_response.py
index 200925dcc94..9da53da373b 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/api_response.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/api_response.py
@@ -16,6 +16,7 @@
 
 import six
 
+
 class ApiResponse(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/array_of_array_of_number_only.py b/samples/client/petstore/python-asyncio/petstore_api/models/array_of_array_of_number_only.py
index 9906156e821..1e5e8be1ed1 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/array_of_array_of_number_only.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/array_of_array_of_number_only.py
@@ -16,6 +16,7 @@
 
 import six
 
+
 class ArrayOfArrayOfNumberOnly(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/array_of_number_only.py b/samples/client/petstore/python-asyncio/petstore_api/models/array_of_number_only.py
index 646bd4393c5..0628f7af1e7 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/array_of_number_only.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/array_of_number_only.py
@@ -16,6 +16,7 @@
 
 import six
 
+
 class ArrayOfNumberOnly(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/array_test.py b/samples/client/petstore/python-asyncio/petstore_api/models/array_test.py
index 2f1a6c51e2a..b0785ac3f13 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/array_test.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/array_test.py
@@ -16,6 +16,7 @@
 
 import six
 
+
 class ArrayTest(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/capitalization.py b/samples/client/petstore/python-asyncio/petstore_api/models/capitalization.py
index 05abe9956bd..83b0068aee2 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/capitalization.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/capitalization.py
@@ -16,6 +16,7 @@
 
 import six
 
+
 class Capitalization(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/cat.py b/samples/client/petstore/python-asyncio/petstore_api/models/cat.py
index 041b42777ff..4bca18ba841 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/cat.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/cat.py
@@ -16,7 +16,8 @@
 
 import six
 
-class Cat(Animal):
+
+class Cat(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
     Do not edit the class manually.
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/category.py b/samples/client/petstore/python-asyncio/petstore_api/models/category.py
index 42b3a25d9fd..dbc4fd28816 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/category.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/category.py
@@ -16,6 +16,7 @@
 
 import six
 
+
 class Category(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/class_model.py b/samples/client/petstore/python-asyncio/petstore_api/models/class_model.py
index 851bd07170f..6042036beb5 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/class_model.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/class_model.py
@@ -16,6 +16,7 @@
 
 import six
 
+
 class ClassModel(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/client.py b/samples/client/petstore/python-asyncio/petstore_api/models/client.py
index 6ec6aa466c8..337100c3946 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/client.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/client.py
@@ -16,6 +16,7 @@
 
 import six
 
+
 class Client(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/dog.py b/samples/client/petstore/python-asyncio/petstore_api/models/dog.py
index 940d9c72806..e4bfea5584c 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/dog.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/dog.py
@@ -16,7 +16,8 @@
 
 import six
 
-class Dog(Animal):
+
+class Dog(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
     Do not edit the class manually.
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/enum_arrays.py b/samples/client/petstore/python-asyncio/petstore_api/models/enum_arrays.py
index 4ded72ab35c..5257b181b88 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/enum_arrays.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/enum_arrays.py
@@ -16,6 +16,7 @@
 
 import six
 
+
 class EnumArrays(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/enum_class.py b/samples/client/petstore/python-asyncio/petstore_api/models/enum_class.py
index 55ead16cfdd..2282270dda1 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/enum_class.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/enum_class.py
@@ -16,6 +16,7 @@
 
 import six
 
+
 class EnumClass(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/enum_test.py b/samples/client/petstore/python-asyncio/petstore_api/models/enum_test.py
index d56e6c54484..f26afa5bdf9 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/enum_test.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/enum_test.py
@@ -16,6 +16,7 @@
 
 import six
 
+
 class EnumTest(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/format_test.py b/samples/client/petstore/python-asyncio/petstore_api/models/format_test.py
index a9a05c023ce..206b991719d 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/format_test.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/format_test.py
@@ -16,6 +16,7 @@
 
 import six
 
+
 class FormatTest(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/has_only_read_only.py b/samples/client/petstore/python-asyncio/petstore_api/models/has_only_read_only.py
index 44763cc757d..76e5ceb1e22 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/has_only_read_only.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/has_only_read_only.py
@@ -16,6 +16,7 @@
 
 import six
 
+
 class HasOnlyReadOnly(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/list.py b/samples/client/petstore/python-asyncio/petstore_api/models/list.py
index d87f84250dd..46eef1e90f3 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/list.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/list.py
@@ -16,6 +16,7 @@
 
 import six
 
+
 class List(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/map_test.py b/samples/client/petstore/python-asyncio/petstore_api/models/map_test.py
index e04bbdb5c6b..f2633c30a99 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/map_test.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/map_test.py
@@ -16,6 +16,7 @@
 
 import six
 
+
 class MapTest(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/mixed_properties_and_additional_properties_class.py b/samples/client/petstore/python-asyncio/petstore_api/models/mixed_properties_and_additional_properties_class.py
index 213def41e7a..cee99da3129 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/mixed_properties_and_additional_properties_class.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/mixed_properties_and_additional_properties_class.py
@@ -16,6 +16,7 @@
 
 import six
 
+
 class MixedPropertiesAndAdditionalPropertiesClass(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/model200_response.py b/samples/client/petstore/python-asyncio/petstore_api/models/model200_response.py
index a23e44d27e7..1fcaabca10e 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/model200_response.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/model200_response.py
@@ -16,6 +16,7 @@
 
 import six
 
+
 class Model200Response(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/model_return.py b/samples/client/petstore/python-asyncio/petstore_api/models/model_return.py
index d500dfde2b5..79253611495 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/model_return.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/model_return.py
@@ -16,6 +16,7 @@
 
 import six
 
+
 class ModelReturn(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/name.py b/samples/client/petstore/python-asyncio/petstore_api/models/name.py
index 32278ab3a99..53be7953ea9 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/name.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/name.py
@@ -16,6 +16,7 @@
 
 import six
 
+
 class Name(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/number_only.py b/samples/client/petstore/python-asyncio/petstore_api/models/number_only.py
index 08a43e9e85f..2f43a834f8b 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/number_only.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/number_only.py
@@ -16,6 +16,7 @@
 
 import six
 
+
 class NumberOnly(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/order.py b/samples/client/petstore/python-asyncio/petstore_api/models/order.py
index f1357a920df..9291652787e 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/order.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/order.py
@@ -16,6 +16,7 @@
 
 import six
 
+
 class Order(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/outer_boolean.py b/samples/client/petstore/python-asyncio/petstore_api/models/outer_boolean.py
index 5b3066c2d35..3b273333e75 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/outer_boolean.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/outer_boolean.py
@@ -16,6 +16,7 @@
 
 import six
 
+
 class OuterBoolean(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/outer_composite.py b/samples/client/petstore/python-asyncio/petstore_api/models/outer_composite.py
index 3d3be1a3801..ec517a4620c 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/outer_composite.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/outer_composite.py
@@ -16,6 +16,7 @@
 
 import six
 
+
 class OuterComposite(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/outer_enum.py b/samples/client/petstore/python-asyncio/petstore_api/models/outer_enum.py
index b48ab7dfb6a..bea07410cf2 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/outer_enum.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/outer_enum.py
@@ -16,6 +16,7 @@
 
 import six
 
+
 class OuterEnum(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/outer_number.py b/samples/client/petstore/python-asyncio/petstore_api/models/outer_number.py
index 048ad15312e..a60e97c8288 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/outer_number.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/outer_number.py
@@ -16,6 +16,7 @@
 
 import six
 
+
 class OuterNumber(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/outer_string.py b/samples/client/petstore/python-asyncio/petstore_api/models/outer_string.py
index f116ff52d9c..622589ce2f6 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/outer_string.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/outer_string.py
@@ -16,6 +16,7 @@
 
 import six
 
+
 class OuterString(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/pet.py b/samples/client/petstore/python-asyncio/petstore_api/models/pet.py
index e33d76de6c5..e91ba99a436 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/pet.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/pet.py
@@ -16,6 +16,7 @@
 
 import six
 
+
 class Pet(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/read_only_first.py b/samples/client/petstore/python-asyncio/petstore_api/models/read_only_first.py
index 62d38b61c69..0a378f93da6 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/read_only_first.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/read_only_first.py
@@ -16,6 +16,7 @@
 
 import six
 
+
 class ReadOnlyFirst(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/special_model_name.py b/samples/client/petstore/python-asyncio/petstore_api/models/special_model_name.py
index 23603b09349..3817430b656 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/special_model_name.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/special_model_name.py
@@ -16,6 +16,7 @@
 
 import six
 
+
 class SpecialModelName(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/tag.py b/samples/client/petstore/python-asyncio/petstore_api/models/tag.py
index 470d9082dd9..dc3c0b5645f 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/tag.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/tag.py
@@ -16,6 +16,7 @@
 
 import six
 
+
 class Tag(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/user.py b/samples/client/petstore/python-asyncio/petstore_api/models/user.py
index 57bd119538d..8dcac91845f 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/user.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/user.py
@@ -16,6 +16,7 @@
 
 import six
 
+
 class User(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python-tornado/.swagger-codegen/VERSION b/samples/client/petstore/python-tornado/.swagger-codegen/VERSION
index 017674fb59d..bba5a87afd0 100644
--- a/samples/client/petstore/python-tornado/.swagger-codegen/VERSION
+++ b/samples/client/petstore/python-tornado/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.4.3-SNAPSHOT
\ No newline at end of file
+2.4.9-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/animal_farm.py b/samples/client/petstore/python-tornado/petstore_api/models/animal_farm.py
index e7904d7fbf6..1df0fb39924 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/animal_farm.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/animal_farm.py
@@ -16,8 +16,6 @@
 
 import six
 
-from petstore_api.models.animal import Animal  # noqa: F401,E501
-
 
 class AnimalFarm(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/array_test.py b/samples/client/petstore/python-tornado/petstore_api/models/array_test.py
index aa2d0d5e633..b0785ac3f13 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/array_test.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/array_test.py
@@ -16,8 +16,6 @@
 
 import six
 
-from petstore_api.models.read_only_first import ReadOnlyFirst  # noqa: F401,E501
-
 
 class ArrayTest(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/cat.py b/samples/client/petstore/python-tornado/petstore_api/models/cat.py
index 3660f18706b..4bca18ba841 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/cat.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/cat.py
@@ -16,10 +16,8 @@
 
 import six
 
-from petstore_api.models.animal import Animal  # noqa: F401,E501
 
-
-class Cat(Animal):
+class Cat(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
     Do not edit the class manually.
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/dog.py b/samples/client/petstore/python-tornado/petstore_api/models/dog.py
index 3d80d6442f4..e4bfea5584c 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/dog.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/dog.py
@@ -16,10 +16,8 @@
 
 import six
 
-from petstore_api.models.animal import Animal  # noqa: F401,E501
 
-
-class Dog(Animal):
+class Dog(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
     Do not edit the class manually.
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/enum_test.py b/samples/client/petstore/python-tornado/petstore_api/models/enum_test.py
index d977ef918bc..f26afa5bdf9 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/enum_test.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/enum_test.py
@@ -16,8 +16,6 @@
 
 import six
 
-from petstore_api.models.outer_enum import OuterEnum  # noqa: F401,E501
-
 
 class EnumTest(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/mixed_properties_and_additional_properties_class.py b/samples/client/petstore/python-tornado/petstore_api/models/mixed_properties_and_additional_properties_class.py
index dfed6cc90bd..cee99da3129 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/mixed_properties_and_additional_properties_class.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/mixed_properties_and_additional_properties_class.py
@@ -16,8 +16,6 @@
 
 import six
 
-from petstore_api.models.animal import Animal  # noqa: F401,E501
-
 
 class MixedPropertiesAndAdditionalPropertiesClass(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/outer_composite.py b/samples/client/petstore/python-tornado/petstore_api/models/outer_composite.py
index 36381acb861..ec517a4620c 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/outer_composite.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/outer_composite.py
@@ -16,10 +16,6 @@
 
 import six
 
-from petstore_api.models.outer_boolean import OuterBoolean  # noqa: F401,E501
-from petstore_api.models.outer_number import OuterNumber  # noqa: F401,E501
-from petstore_api.models.outer_string import OuterString  # noqa: F401,E501
-
 
 class OuterComposite(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/pet.py b/samples/client/petstore/python-tornado/petstore_api/models/pet.py
index c7c206c7a93..e91ba99a436 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/pet.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/pet.py
@@ -16,9 +16,6 @@
 
 import six
 
-from petstore_api.models.category import Category  # noqa: F401,E501
-from petstore_api.models.tag import Tag  # noqa: F401,E501
-
 
 class Pet(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/samples/client/petstore/python/petstore_api/models/additional_properties_class.py b/samples/client/petstore/python/petstore_api/models/additional_properties_class.py
index 63bc21e2807..83de7092668 100644
--- a/samples/client/petstore/python/petstore_api/models/additional_properties_class.py
+++ b/samples/client/petstore/python/petstore_api/models/additional_properties_class.py
@@ -16,6 +16,7 @@
 
 import six
 
+
 class AdditionalPropertiesClass(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python/petstore_api/models/animal.py b/samples/client/petstore/python/petstore_api/models/animal.py
index d5a562fae8e..5175148b2d3 100644
--- a/samples/client/petstore/python/petstore_api/models/animal.py
+++ b/samples/client/petstore/python/petstore_api/models/animal.py
@@ -16,6 +16,7 @@
 
 import six
 
+
 class Animal(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python/petstore_api/models/animal_farm.py b/samples/client/petstore/python/petstore_api/models/animal_farm.py
index 6231d5e2997..1df0fb39924 100644
--- a/samples/client/petstore/python/petstore_api/models/animal_farm.py
+++ b/samples/client/petstore/python/petstore_api/models/animal_farm.py
@@ -16,6 +16,7 @@
 
 import six
 
+
 class AnimalFarm(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python/petstore_api/models/api_response.py b/samples/client/petstore/python/petstore_api/models/api_response.py
index 200925dcc94..9da53da373b 100644
--- a/samples/client/petstore/python/petstore_api/models/api_response.py
+++ b/samples/client/petstore/python/petstore_api/models/api_response.py
@@ -16,6 +16,7 @@
 
 import six
 
+
 class ApiResponse(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python/petstore_api/models/array_of_array_of_number_only.py b/samples/client/petstore/python/petstore_api/models/array_of_array_of_number_only.py
index 9906156e821..1e5e8be1ed1 100644
--- a/samples/client/petstore/python/petstore_api/models/array_of_array_of_number_only.py
+++ b/samples/client/petstore/python/petstore_api/models/array_of_array_of_number_only.py
@@ -16,6 +16,7 @@
 
 import six
 
+
 class ArrayOfArrayOfNumberOnly(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python/petstore_api/models/array_of_number_only.py b/samples/client/petstore/python/petstore_api/models/array_of_number_only.py
index 646bd4393c5..0628f7af1e7 100644
--- a/samples/client/petstore/python/petstore_api/models/array_of_number_only.py
+++ b/samples/client/petstore/python/petstore_api/models/array_of_number_only.py
@@ -16,6 +16,7 @@
 
 import six
 
+
 class ArrayOfNumberOnly(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python/petstore_api/models/array_test.py b/samples/client/petstore/python/petstore_api/models/array_test.py
index 2f1a6c51e2a..b0785ac3f13 100644
--- a/samples/client/petstore/python/petstore_api/models/array_test.py
+++ b/samples/client/petstore/python/petstore_api/models/array_test.py
@@ -16,6 +16,7 @@
 
 import six
 
+
 class ArrayTest(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python/petstore_api/models/capitalization.py b/samples/client/petstore/python/petstore_api/models/capitalization.py
index 05abe9956bd..83b0068aee2 100644
--- a/samples/client/petstore/python/petstore_api/models/capitalization.py
+++ b/samples/client/petstore/python/petstore_api/models/capitalization.py
@@ -16,6 +16,7 @@
 
 import six
 
+
 class Capitalization(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python/petstore_api/models/cat.py b/samples/client/petstore/python/petstore_api/models/cat.py
index 041b42777ff..4bca18ba841 100644
--- a/samples/client/petstore/python/petstore_api/models/cat.py
+++ b/samples/client/petstore/python/petstore_api/models/cat.py
@@ -16,7 +16,8 @@
 
 import six
 
-class Cat(Animal):
+
+class Cat(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
     Do not edit the class manually.
diff --git a/samples/client/petstore/python/petstore_api/models/category.py b/samples/client/petstore/python/petstore_api/models/category.py
index 42b3a25d9fd..dbc4fd28816 100644
--- a/samples/client/petstore/python/petstore_api/models/category.py
+++ b/samples/client/petstore/python/petstore_api/models/category.py
@@ -16,6 +16,7 @@
 
 import six
 
+
 class Category(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python/petstore_api/models/class_model.py b/samples/client/petstore/python/petstore_api/models/class_model.py
index 851bd07170f..6042036beb5 100644
--- a/samples/client/petstore/python/petstore_api/models/class_model.py
+++ b/samples/client/petstore/python/petstore_api/models/class_model.py
@@ -16,6 +16,7 @@
 
 import six
 
+
 class ClassModel(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python/petstore_api/models/client.py b/samples/client/petstore/python/petstore_api/models/client.py
index 6ec6aa466c8..337100c3946 100644
--- a/samples/client/petstore/python/petstore_api/models/client.py
+++ b/samples/client/petstore/python/petstore_api/models/client.py
@@ -16,6 +16,7 @@
 
 import six
 
+
 class Client(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python/petstore_api/models/dog.py b/samples/client/petstore/python/petstore_api/models/dog.py
index 940d9c72806..e4bfea5584c 100644
--- a/samples/client/petstore/python/petstore_api/models/dog.py
+++ b/samples/client/petstore/python/petstore_api/models/dog.py
@@ -16,7 +16,8 @@
 
 import six
 
-class Dog(Animal):
+
+class Dog(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
     Do not edit the class manually.
diff --git a/samples/client/petstore/python/petstore_api/models/enum_arrays.py b/samples/client/petstore/python/petstore_api/models/enum_arrays.py
index 4ded72ab35c..5257b181b88 100644
--- a/samples/client/petstore/python/petstore_api/models/enum_arrays.py
+++ b/samples/client/petstore/python/petstore_api/models/enum_arrays.py
@@ -16,6 +16,7 @@
 
 import six
 
+
 class EnumArrays(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python/petstore_api/models/enum_class.py b/samples/client/petstore/python/petstore_api/models/enum_class.py
index 55ead16cfdd..2282270dda1 100644
--- a/samples/client/petstore/python/petstore_api/models/enum_class.py
+++ b/samples/client/petstore/python/petstore_api/models/enum_class.py
@@ -16,6 +16,7 @@
 
 import six
 
+
 class EnumClass(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python/petstore_api/models/enum_test.py b/samples/client/petstore/python/petstore_api/models/enum_test.py
index d56e6c54484..f26afa5bdf9 100644
--- a/samples/client/petstore/python/petstore_api/models/enum_test.py
+++ b/samples/client/petstore/python/petstore_api/models/enum_test.py
@@ -16,6 +16,7 @@
 
 import six
 
+
 class EnumTest(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python/petstore_api/models/format_test.py b/samples/client/petstore/python/petstore_api/models/format_test.py
index a9a05c023ce..206b991719d 100644
--- a/samples/client/petstore/python/petstore_api/models/format_test.py
+++ b/samples/client/petstore/python/petstore_api/models/format_test.py
@@ -16,6 +16,7 @@
 
 import six
 
+
 class FormatTest(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python/petstore_api/models/has_only_read_only.py b/samples/client/petstore/python/petstore_api/models/has_only_read_only.py
index 44763cc757d..76e5ceb1e22 100644
--- a/samples/client/petstore/python/petstore_api/models/has_only_read_only.py
+++ b/samples/client/petstore/python/petstore_api/models/has_only_read_only.py
@@ -16,6 +16,7 @@
 
 import six
 
+
 class HasOnlyReadOnly(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python/petstore_api/models/list.py b/samples/client/petstore/python/petstore_api/models/list.py
index d87f84250dd..46eef1e90f3 100644
--- a/samples/client/petstore/python/petstore_api/models/list.py
+++ b/samples/client/petstore/python/petstore_api/models/list.py
@@ -16,6 +16,7 @@
 
 import six
 
+
 class List(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python/petstore_api/models/map_test.py b/samples/client/petstore/python/petstore_api/models/map_test.py
index e04bbdb5c6b..f2633c30a99 100644
--- a/samples/client/petstore/python/petstore_api/models/map_test.py
+++ b/samples/client/petstore/python/petstore_api/models/map_test.py
@@ -16,6 +16,7 @@
 
 import six
 
+
 class MapTest(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python/petstore_api/models/mixed_properties_and_additional_properties_class.py b/samples/client/petstore/python/petstore_api/models/mixed_properties_and_additional_properties_class.py
index 213def41e7a..cee99da3129 100644
--- a/samples/client/petstore/python/petstore_api/models/mixed_properties_and_additional_properties_class.py
+++ b/samples/client/petstore/python/petstore_api/models/mixed_properties_and_additional_properties_class.py
@@ -16,6 +16,7 @@
 
 import six
 
+
 class MixedPropertiesAndAdditionalPropertiesClass(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python/petstore_api/models/model200_response.py b/samples/client/petstore/python/petstore_api/models/model200_response.py
index a23e44d27e7..1fcaabca10e 100644
--- a/samples/client/petstore/python/petstore_api/models/model200_response.py
+++ b/samples/client/petstore/python/petstore_api/models/model200_response.py
@@ -16,6 +16,7 @@
 
 import six
 
+
 class Model200Response(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python/petstore_api/models/model_return.py b/samples/client/petstore/python/petstore_api/models/model_return.py
index d500dfde2b5..79253611495 100644
--- a/samples/client/petstore/python/petstore_api/models/model_return.py
+++ b/samples/client/petstore/python/petstore_api/models/model_return.py
@@ -16,6 +16,7 @@
 
 import six
 
+
 class ModelReturn(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python/petstore_api/models/name.py b/samples/client/petstore/python/petstore_api/models/name.py
index 32278ab3a99..53be7953ea9 100644
--- a/samples/client/petstore/python/petstore_api/models/name.py
+++ b/samples/client/petstore/python/petstore_api/models/name.py
@@ -16,6 +16,7 @@
 
 import six
 
+
 class Name(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python/petstore_api/models/number_only.py b/samples/client/petstore/python/petstore_api/models/number_only.py
index 08a43e9e85f..2f43a834f8b 100644
--- a/samples/client/petstore/python/petstore_api/models/number_only.py
+++ b/samples/client/petstore/python/petstore_api/models/number_only.py
@@ -16,6 +16,7 @@
 
 import six
 
+
 class NumberOnly(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python/petstore_api/models/order.py b/samples/client/petstore/python/petstore_api/models/order.py
index f1357a920df..9291652787e 100644
--- a/samples/client/petstore/python/petstore_api/models/order.py
+++ b/samples/client/petstore/python/petstore_api/models/order.py
@@ -16,6 +16,7 @@
 
 import six
 
+
 class Order(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python/petstore_api/models/outer_boolean.py b/samples/client/petstore/python/petstore_api/models/outer_boolean.py
index 5b3066c2d35..3b273333e75 100644
--- a/samples/client/petstore/python/petstore_api/models/outer_boolean.py
+++ b/samples/client/petstore/python/petstore_api/models/outer_boolean.py
@@ -16,6 +16,7 @@
 
 import six
 
+
 class OuterBoolean(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python/petstore_api/models/outer_composite.py b/samples/client/petstore/python/petstore_api/models/outer_composite.py
index 3d3be1a3801..ec517a4620c 100644
--- a/samples/client/petstore/python/petstore_api/models/outer_composite.py
+++ b/samples/client/petstore/python/petstore_api/models/outer_composite.py
@@ -16,6 +16,7 @@
 
 import six
 
+
 class OuterComposite(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python/petstore_api/models/outer_enum.py b/samples/client/petstore/python/petstore_api/models/outer_enum.py
index b48ab7dfb6a..bea07410cf2 100644
--- a/samples/client/petstore/python/petstore_api/models/outer_enum.py
+++ b/samples/client/petstore/python/petstore_api/models/outer_enum.py
@@ -16,6 +16,7 @@
 
 import six
 
+
 class OuterEnum(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python/petstore_api/models/outer_number.py b/samples/client/petstore/python/petstore_api/models/outer_number.py
index 048ad15312e..a60e97c8288 100644
--- a/samples/client/petstore/python/petstore_api/models/outer_number.py
+++ b/samples/client/petstore/python/petstore_api/models/outer_number.py
@@ -16,6 +16,7 @@
 
 import six
 
+
 class OuterNumber(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python/petstore_api/models/outer_string.py b/samples/client/petstore/python/petstore_api/models/outer_string.py
index f116ff52d9c..622589ce2f6 100644
--- a/samples/client/petstore/python/petstore_api/models/outer_string.py
+++ b/samples/client/petstore/python/petstore_api/models/outer_string.py
@@ -16,6 +16,7 @@
 
 import six
 
+
 class OuterString(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python/petstore_api/models/pet.py b/samples/client/petstore/python/petstore_api/models/pet.py
index e33d76de6c5..e91ba99a436 100644
--- a/samples/client/petstore/python/petstore_api/models/pet.py
+++ b/samples/client/petstore/python/petstore_api/models/pet.py
@@ -16,6 +16,7 @@
 
 import six
 
+
 class Pet(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python/petstore_api/models/read_only_first.py b/samples/client/petstore/python/petstore_api/models/read_only_first.py
index 62d38b61c69..0a378f93da6 100644
--- a/samples/client/petstore/python/petstore_api/models/read_only_first.py
+++ b/samples/client/petstore/python/petstore_api/models/read_only_first.py
@@ -16,6 +16,7 @@
 
 import six
 
+
 class ReadOnlyFirst(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python/petstore_api/models/special_model_name.py b/samples/client/petstore/python/petstore_api/models/special_model_name.py
index 23603b09349..3817430b656 100644
--- a/samples/client/petstore/python/petstore_api/models/special_model_name.py
+++ b/samples/client/petstore/python/petstore_api/models/special_model_name.py
@@ -16,6 +16,7 @@
 
 import six
 
+
 class SpecialModelName(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python/petstore_api/models/tag.py b/samples/client/petstore/python/petstore_api/models/tag.py
index 470d9082dd9..dc3c0b5645f 100644
--- a/samples/client/petstore/python/petstore_api/models/tag.py
+++ b/samples/client/petstore/python/petstore_api/models/tag.py
@@ -16,6 +16,7 @@
 
 import six
 
+
 class Tag(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python/petstore_api/models/user.py b/samples/client/petstore/python/petstore_api/models/user.py
index 57bd119538d..8dcac91845f 100644
--- a/samples/client/petstore/python/petstore_api/models/user.py
+++ b/samples/client/petstore/python/petstore_api/models/user.py
@@ -16,6 +16,7 @@
 
 import six
 
+
 class User(object):
     """NOTE: This class is auto generated by the swagger code generator program.