From 3b742d94eba16f5c12671d714099665c1e1a8826 Mon Sep 17 00:00:00 2001
From: HugoMario <hugo.mario.mercado@gmail.com>
Date: Thu, 18 Jun 2020 20:35:35 -0500
Subject: [PATCH] updated python sample

---
 .../petstore/python/.swagger-codegen/VERSION  |   2 +-
 samples/client/petstore/python/.travis.yml    |   1 -
 .../python/docs/AllOfSubCategoryCategory.md   |   2 -
 .../python/docs/AllOfSubCategoryPetsItems.md  |   6 -
 samples/client/petstore/python/docs/Cat.md    |   2 -
 samples/client/petstore/python/docs/Dog.md    |   2 -
 .../models/additional_properties_class.py     |   1 -
 .../models/all_of_sub_category_category.py    |  58 +-----
 .../models/all_of_sub_category_pets_items.py  | 172 +-----------------
 .../models/all_pets_response.py               |   1 -
 .../python/swagger_client/models/animal.py    |   1 -
 .../swagger_client/models/animal_farm.py      |   1 -
 .../swagger_client/models/api_response.py     |   1 -
 .../models/array_of_array_of_number_only.py   |   1 -
 .../models/array_of_number_only.py            |   1 -
 .../swagger_client/models/array_test.py       |   1 -
 .../python/swagger_client/models/body.py      |   1 -
 .../python/swagger_client/models/body1.py     |   1 -
 .../python/swagger_client/models/body2.py     |   1 -
 .../python/swagger_client/models/body3.py     |   1 -
 .../python/swagger_client/models/body4.py     |   1 -
 .../python/swagger_client/models/body5.py     |   1 -
 .../python/swagger_client/models/body6.py     |   1 -
 .../python/swagger_client/models/body7.py     |   1 -
 .../swagger_client/models/capitalization.py   |   1 -
 .../python/swagger_client/models/cat.py       |  59 +-----
 .../python/swagger_client/models/category.py  |   1 -
 .../swagger_client/models/class_model.py      |   1 -
 .../python/swagger_client/models/client.py    |   1 -
 .../python/swagger_client/models/dog.py       |  59 +-----
 .../swagger_client/models/enum_arrays.py      |   1 -
 .../swagger_client/models/enum_class.py       |   1 -
 .../python/swagger_client/models/enum_test.py |   1 -
 .../swagger_client/models/format_test.py      |   1 -
 .../models/has_only_read_only.py              |   1 -
 .../python/swagger_client/models/list.py      |   1 -
 .../python/swagger_client/models/map_test.py  |   1 -
 ...perties_and_additional_properties_class.py |   1 -
 .../models/model200_response.py               |   1 -
 .../swagger_client/models/model_return.py     |   1 -
 .../python/swagger_client/models/name.py      |   1 -
 .../models/nullable_enum_model.py             |   1 -
 .../swagger_client/models/number_only.py      |   1 -
 .../models/one_of_all_pets_response_items.py  |   1 -
 .../models/one_of_single_pet_response_pet.py  |   1 -
 .../python/swagger_client/models/order.py     |   1 -
 .../swagger_client/models/outer_boolean.py    |   1 -
 .../swagger_client/models/outer_composite.py  |   1 -
 .../swagger_client/models/outer_enum.py       |   1 -
 .../swagger_client/models/outer_number.py     |   1 -
 .../swagger_client/models/outer_string.py     |   1 -
 .../python/swagger_client/models/pet.py       |   1 -
 .../swagger_client/models/read_only_first.py  |   1 -
 .../models/single_pet_response.py             |   1 -
 .../models/special_model_name.py              |   1 -
 .../swagger_client/models/sub_category.py     |   1 -
 .../python/swagger_client/models/tag.py       |   1 -
 .../python/swagger_client/models/user.py      |   1 -
 .../petstore/python/swagger_client/rest.py    |   2 +-
 samples/client/petstore/python/tox.ini        |   2 +-
 60 files changed, 15 insertions(+), 400 deletions(-)

diff --git a/samples/client/petstore/python/.swagger-codegen/VERSION b/samples/client/petstore/python/.swagger-codegen/VERSION
index d7d7c41be29..aa9a8d010c6 100644
--- a/samples/client/petstore/python/.swagger-codegen/VERSION
+++ b/samples/client/petstore/python/.swagger-codegen/VERSION
@@ -1 +1 @@
-3.0.19-SNAPSHOT
\ No newline at end of file
+3.0.21-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/python/.travis.yml b/samples/client/petstore/python/.travis.yml
index 86211e2d4a2..dd6c4450aa9 100644
--- a/samples/client/petstore/python/.travis.yml
+++ b/samples/client/petstore/python/.travis.yml
@@ -1,7 +1,6 @@
 # ref: https://docs.travis-ci.com/user/languages/python
 language: python
 python:
-  - "2.7"
   - "3.2"
   - "3.3"
   - "3.4"
diff --git a/samples/client/petstore/python/docs/AllOfSubCategoryCategory.md b/samples/client/petstore/python/docs/AllOfSubCategoryCategory.md
index ec6b3cd5523..685b691fbee 100644
--- a/samples/client/petstore/python/docs/AllOfSubCategoryCategory.md
+++ b/samples/client/petstore/python/docs/AllOfSubCategoryCategory.md
@@ -3,8 +3,6 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**id** | **int** |  | [optional] 
-**name** | **str** |  | [optional] 
 **foo** | **bool** |  | [optional] 
 **bar** | **int** |  | [optional] 
 **beer** | **str** |  | [optional] 
diff --git a/samples/client/petstore/python/docs/AllOfSubCategoryPetsItems.md b/samples/client/petstore/python/docs/AllOfSubCategoryPetsItems.md
index 2af04b0eeff..7927537974f 100644
--- a/samples/client/petstore/python/docs/AllOfSubCategoryPetsItems.md
+++ b/samples/client/petstore/python/docs/AllOfSubCategoryPetsItems.md
@@ -3,12 +3,6 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**id** | **int** |  | [optional] 
-**category** | [**Category**](Category.md) |  | [optional] 
-**name** | **str** |  | 
-**photo_urls** | **list[str]** |  | 
-**tags** | [**list[Tag]**](Tag.md) |  | [optional] 
-**status** | **str** | pet status in the store | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/client/petstore/python/docs/Cat.md b/samples/client/petstore/python/docs/Cat.md
index 833a182b40a..ece3c8dc0f8 100644
--- a/samples/client/petstore/python/docs/Cat.md
+++ b/samples/client/petstore/python/docs/Cat.md
@@ -3,8 +3,6 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**class_name** | **str** |  | 
-**color** | **str** |  | [optional] [default to 'red']
 **declawed** | **bool** |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
diff --git a/samples/client/petstore/python/docs/Dog.md b/samples/client/petstore/python/docs/Dog.md
index 1fce53f7cb6..86b51d083c0 100644
--- a/samples/client/petstore/python/docs/Dog.md
+++ b/samples/client/petstore/python/docs/Dog.md
@@ -3,8 +3,6 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**class_name** | **str** |  | 
-**color** | **str** |  | [optional] [default to 'red']
 **breed** | **str** |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
diff --git a/samples/client/petstore/python/swagger_client/models/additional_properties_class.py b/samples/client/petstore/python/swagger_client/models/additional_properties_class.py
index c71eb761695..832be025360 100644
--- a/samples/client/petstore/python/swagger_client/models/additional_properties_class.py
+++ b/samples/client/petstore/python/swagger_client/models/additional_properties_class.py
@@ -15,7 +15,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/swagger_client/models/all_of_sub_category_category.py b/samples/client/petstore/python/swagger_client/models/all_of_sub_category_category.py
index da3eb84b7f6..d8eecb4433e 100644
--- a/samples/client/petstore/python/swagger_client/models/all_of_sub_category_category.py
+++ b/samples/client/petstore/python/swagger_client/models/all_of_sub_category_category.py
@@ -14,9 +14,9 @@
 import re  # noqa: F401
 
 import six
+from swagger_client.models.category import Category  # noqa: F401,E501
 
-
-class AllOfSubCategoryCategory(object):
+class AllOfSubCategoryCategory(Category):
     """NOTE: This class is auto generated by the swagger code generator program.
 
     Do not edit the class manually.
@@ -29,8 +29,6 @@ class AllOfSubCategoryCategory(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'id': 'int',
-        'name': 'str',
         'foo': 'bool',
         'bar': 'int',
         'beer': 'str',
@@ -40,8 +38,6 @@ class AllOfSubCategoryCategory(object):
         swagger_types.update(Category.swagger_types)
 
     attribute_map = {
-        'id': 'id',
-        'name': 'name',
         'foo': 'foo',
         'bar': 'bar',
         'beer': 'beer',
@@ -50,19 +46,13 @@ class AllOfSubCategoryCategory(object):
     if hasattr(Category, "attribute_map"):
         attribute_map.update(Category.attribute_map)
 
-    def __init__(self, id=None, name=None, foo=None, bar=None, beer=None, drunk=None, *args, **kwargs):  # noqa: E501
+    def __init__(self, foo=None, bar=None, beer=None, drunk=None, *args, **kwargs):  # noqa: E501
         """AllOfSubCategoryCategory - a model defined in Swagger"""  # noqa: E501
-        self._id = None
-        self._name = None
         self._foo = None
         self._bar = None
         self._beer = None
         self._drunk = None
         self.discriminator = None
-        if id is not None:
-            self.id = id
-        if name is not None:
-            self.name = name
         if foo is not None:
             self.foo = foo
         if bar is not None:
@@ -73,48 +63,6 @@ def __init__(self, id=None, name=None, foo=None, bar=None, beer=None, drunk=None
             self.drunk = drunk
         Category.__init__(self, *args, **kwargs)
 
-    @property
-    def id(self):
-        """Gets the id of this AllOfSubCategoryCategory.  # noqa: E501
-
-
-        :return: The id of this AllOfSubCategoryCategory.  # noqa: E501
-        :rtype: int
-        """
-        return self._id
-
-    @id.setter
-    def id(self, id):
-        """Sets the id of this AllOfSubCategoryCategory.
-
-
-        :param id: The id of this AllOfSubCategoryCategory.  # noqa: E501
-        :type: int
-        """
-
-        self._id = id
-
-    @property
-    def name(self):
-        """Gets the name of this AllOfSubCategoryCategory.  # noqa: E501
-
-
-        :return: The name of this AllOfSubCategoryCategory.  # noqa: E501
-        :rtype: str
-        """
-        return self._name
-
-    @name.setter
-    def name(self, name):
-        """Sets the name of this AllOfSubCategoryCategory.
-
-
-        :param name: The name of this AllOfSubCategoryCategory.  # noqa: E501
-        :type: str
-        """
-
-        self._name = name
-
     @property
     def foo(self):
         """Gets the foo of this AllOfSubCategoryCategory.  # noqa: E501
diff --git a/samples/client/petstore/python/swagger_client/models/all_of_sub_category_pets_items.py b/samples/client/petstore/python/swagger_client/models/all_of_sub_category_pets_items.py
index 552502efd59..06b5b0cb8ec 100644
--- a/samples/client/petstore/python/swagger_client/models/all_of_sub_category_pets_items.py
+++ b/samples/client/petstore/python/swagger_client/models/all_of_sub_category_pets_items.py
@@ -14,9 +14,9 @@
 import re  # noqa: F401
 
 import six
+from swagger_client.models.pet import Pet  # noqa: F401,E501
 
-
-class AllOfSubCategoryPetsItems(object):
+class AllOfSubCategoryPetsItems(Pet):
     """NOTE: This class is auto generated by the swagger code generator program.
 
     Do not edit the class manually.
@@ -29,186 +29,20 @@ class AllOfSubCategoryPetsItems(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'id': 'int',
-        'category': 'Category',
-        'name': 'str',
-        'photo_urls': 'list[str]',
-        'tags': 'list[Tag]',
-        'status': 'str'
     }
     if hasattr(Pet, "swagger_types"):
         swagger_types.update(Pet.swagger_types)
 
     attribute_map = {
-        'id': 'id',
-        'category': 'category',
-        'name': 'name',
-        'photo_urls': 'photoUrls',
-        'tags': 'tags',
-        'status': 'status'
     }
     if hasattr(Pet, "attribute_map"):
         attribute_map.update(Pet.attribute_map)
 
-    def __init__(self, id=None, category=None, name=None, photo_urls=None, tags=None, status=None, *args, **kwargs):  # noqa: E501
+    def __init__(self, *args, **kwargs):  # noqa: E501
         """AllOfSubCategoryPetsItems - a model defined in Swagger"""  # noqa: E501
-        self._id = None
-        self._category = None
-        self._name = None
-        self._photo_urls = None
-        self._tags = None
-        self._status = None
         self.discriminator = None
-        if id is not None:
-            self.id = id
-        if category is not None:
-            self.category = category
-        self.name = name
-        self.photo_urls = photo_urls
-        if tags is not None:
-            self.tags = tags
-        if status is not None:
-            self.status = status
         Pet.__init__(self, *args, **kwargs)
 
-    @property
-    def id(self):
-        """Gets the id of this AllOfSubCategoryPetsItems.  # noqa: E501
-
-
-        :return: The id of this AllOfSubCategoryPetsItems.  # noqa: E501
-        :rtype: int
-        """
-        return self._id
-
-    @id.setter
-    def id(self, id):
-        """Sets the id of this AllOfSubCategoryPetsItems.
-
-
-        :param id: The id of this AllOfSubCategoryPetsItems.  # noqa: E501
-        :type: int
-        """
-
-        self._id = id
-
-    @property
-    def category(self):
-        """Gets the category of this AllOfSubCategoryPetsItems.  # noqa: E501
-
-
-        :return: The category of this AllOfSubCategoryPetsItems.  # noqa: E501
-        :rtype: Category
-        """
-        return self._category
-
-    @category.setter
-    def category(self, category):
-        """Sets the category of this AllOfSubCategoryPetsItems.
-
-
-        :param category: The category of this AllOfSubCategoryPetsItems.  # noqa: E501
-        :type: Category
-        """
-
-        self._category = category
-
-    @property
-    def name(self):
-        """Gets the name of this AllOfSubCategoryPetsItems.  # noqa: E501
-
-
-        :return: The name of this AllOfSubCategoryPetsItems.  # noqa: E501
-        :rtype: str
-        """
-        return self._name
-
-    @name.setter
-    def name(self, name):
-        """Sets the name of this AllOfSubCategoryPetsItems.
-
-
-        :param name: The name of this AllOfSubCategoryPetsItems.  # noqa: E501
-        :type: str
-        """
-        if name is None:
-            raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
-
-        self._name = name
-
-    @property
-    def photo_urls(self):
-        """Gets the photo_urls of this AllOfSubCategoryPetsItems.  # noqa: E501
-
-
-        :return: The photo_urls of this AllOfSubCategoryPetsItems.  # noqa: E501
-        :rtype: list[str]
-        """
-        return self._photo_urls
-
-    @photo_urls.setter
-    def photo_urls(self, photo_urls):
-        """Sets the photo_urls of this AllOfSubCategoryPetsItems.
-
-
-        :param photo_urls: The photo_urls of this AllOfSubCategoryPetsItems.  # noqa: E501
-        :type: list[str]
-        """
-        if photo_urls is None:
-            raise ValueError("Invalid value for `photo_urls`, must not be `None`")  # noqa: E501
-
-        self._photo_urls = photo_urls
-
-    @property
-    def tags(self):
-        """Gets the tags of this AllOfSubCategoryPetsItems.  # noqa: E501
-
-
-        :return: The tags of this AllOfSubCategoryPetsItems.  # noqa: E501
-        :rtype: list[Tag]
-        """
-        return self._tags
-
-    @tags.setter
-    def tags(self, tags):
-        """Sets the tags of this AllOfSubCategoryPetsItems.
-
-
-        :param tags: The tags of this AllOfSubCategoryPetsItems.  # noqa: E501
-        :type: list[Tag]
-        """
-
-        self._tags = tags
-
-    @property
-    def status(self):
-        """Gets the status of this AllOfSubCategoryPetsItems.  # noqa: E501
-
-        pet status in the store  # noqa: E501
-
-        :return: The status of this AllOfSubCategoryPetsItems.  # noqa: E501
-        :rtype: str
-        """
-        return self._status
-
-    @status.setter
-    def status(self, status):
-        """Sets the status of this AllOfSubCategoryPetsItems.
-
-        pet status in the store  # noqa: E501
-
-        :param status: The status of this AllOfSubCategoryPetsItems.  # noqa: E501
-        :type: str
-        """
-        allowed_values = ["available", "pending", "sold"]  # noqa: E501
-        if status not in allowed_values:
-            raise ValueError(
-                "Invalid value for `status` ({0}), must be one of {1}"  # noqa: E501
-                .format(status, allowed_values)
-            )
-
-        self._status = status
-
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/samples/client/petstore/python/swagger_client/models/all_pets_response.py b/samples/client/petstore/python/swagger_client/models/all_pets_response.py
index 3171c75f7e3..3890b72bc82 100644
--- a/samples/client/petstore/python/swagger_client/models/all_pets_response.py
+++ b/samples/client/petstore/python/swagger_client/models/all_pets_response.py
@@ -15,7 +15,6 @@
 
 import six
 
-
 class AllPetsResponse(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python/swagger_client/models/animal.py b/samples/client/petstore/python/swagger_client/models/animal.py
index 05c1eeb2213..54486cdc8b3 100644
--- a/samples/client/petstore/python/swagger_client/models/animal.py
+++ b/samples/client/petstore/python/swagger_client/models/animal.py
@@ -15,7 +15,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/swagger_client/models/animal_farm.py b/samples/client/petstore/python/swagger_client/models/animal_farm.py
index c2600c9921d..380a0eac179 100644
--- a/samples/client/petstore/python/swagger_client/models/animal_farm.py
+++ b/samples/client/petstore/python/swagger_client/models/animal_farm.py
@@ -15,7 +15,6 @@
 
 import six
 
-
 class AnimalFarm(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python/swagger_client/models/api_response.py b/samples/client/petstore/python/swagger_client/models/api_response.py
index 527766b7d8f..82b6d0a5087 100644
--- a/samples/client/petstore/python/swagger_client/models/api_response.py
+++ b/samples/client/petstore/python/swagger_client/models/api_response.py
@@ -15,7 +15,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/swagger_client/models/array_of_array_of_number_only.py b/samples/client/petstore/python/swagger_client/models/array_of_array_of_number_only.py
index aeb09448e0f..3ebc0d61699 100644
--- a/samples/client/petstore/python/swagger_client/models/array_of_array_of_number_only.py
+++ b/samples/client/petstore/python/swagger_client/models/array_of_array_of_number_only.py
@@ -15,7 +15,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/swagger_client/models/array_of_number_only.py b/samples/client/petstore/python/swagger_client/models/array_of_number_only.py
index 32ad20acb66..5644e871338 100644
--- a/samples/client/petstore/python/swagger_client/models/array_of_number_only.py
+++ b/samples/client/petstore/python/swagger_client/models/array_of_number_only.py
@@ -15,7 +15,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/swagger_client/models/array_test.py b/samples/client/petstore/python/swagger_client/models/array_test.py
index e297c4a08a5..2ba797f1423 100644
--- a/samples/client/petstore/python/swagger_client/models/array_test.py
+++ b/samples/client/petstore/python/swagger_client/models/array_test.py
@@ -15,7 +15,6 @@
 
 import six
 
-
 class ArrayTest(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python/swagger_client/models/body.py b/samples/client/petstore/python/swagger_client/models/body.py
index f56e4b4b9df..d51a01208e5 100644
--- a/samples/client/petstore/python/swagger_client/models/body.py
+++ b/samples/client/petstore/python/swagger_client/models/body.py
@@ -15,7 +15,6 @@
 
 import six
 
-
 class Body(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python/swagger_client/models/body1.py b/samples/client/petstore/python/swagger_client/models/body1.py
index e0c0f7d950c..310ba351cdd 100644
--- a/samples/client/petstore/python/swagger_client/models/body1.py
+++ b/samples/client/petstore/python/swagger_client/models/body1.py
@@ -15,7 +15,6 @@
 
 import six
 
-
 class Body1(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python/swagger_client/models/body2.py b/samples/client/petstore/python/swagger_client/models/body2.py
index d76239444ce..c3d658c7bda 100644
--- a/samples/client/petstore/python/swagger_client/models/body2.py
+++ b/samples/client/petstore/python/swagger_client/models/body2.py
@@ -15,7 +15,6 @@
 
 import six
 
-
 class Body2(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python/swagger_client/models/body3.py b/samples/client/petstore/python/swagger_client/models/body3.py
index 792f35bb9ee..d5cf55a16cb 100644
--- a/samples/client/petstore/python/swagger_client/models/body3.py
+++ b/samples/client/petstore/python/swagger_client/models/body3.py
@@ -15,7 +15,6 @@
 
 import six
 
-
 class Body3(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python/swagger_client/models/body4.py b/samples/client/petstore/python/swagger_client/models/body4.py
index 22ff8844766..2b12fe6b75f 100644
--- a/samples/client/petstore/python/swagger_client/models/body4.py
+++ b/samples/client/petstore/python/swagger_client/models/body4.py
@@ -15,7 +15,6 @@
 
 import six
 
-
 class Body4(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python/swagger_client/models/body5.py b/samples/client/petstore/python/swagger_client/models/body5.py
index ed30e2263be..f451daca65f 100644
--- a/samples/client/petstore/python/swagger_client/models/body5.py
+++ b/samples/client/petstore/python/swagger_client/models/body5.py
@@ -15,7 +15,6 @@
 
 import six
 
-
 class Body5(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python/swagger_client/models/body6.py b/samples/client/petstore/python/swagger_client/models/body6.py
index e648d53d601..56a07f80ab9 100644
--- a/samples/client/petstore/python/swagger_client/models/body6.py
+++ b/samples/client/petstore/python/swagger_client/models/body6.py
@@ -15,7 +15,6 @@
 
 import six
 
-
 class Body6(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python/swagger_client/models/body7.py b/samples/client/petstore/python/swagger_client/models/body7.py
index d2e8f433145..c2d07976054 100644
--- a/samples/client/petstore/python/swagger_client/models/body7.py
+++ b/samples/client/petstore/python/swagger_client/models/body7.py
@@ -15,7 +15,6 @@
 
 import six
 
-
 class Body7(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python/swagger_client/models/capitalization.py b/samples/client/petstore/python/swagger_client/models/capitalization.py
index 9dc20aa55e4..bd82dc750a1 100644
--- a/samples/client/petstore/python/swagger_client/models/capitalization.py
+++ b/samples/client/petstore/python/swagger_client/models/capitalization.py
@@ -15,7 +15,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/swagger_client/models/cat.py b/samples/client/petstore/python/swagger_client/models/cat.py
index 6dbeeb40de1..b3295bc21e3 100644
--- a/samples/client/petstore/python/swagger_client/models/cat.py
+++ b/samples/client/petstore/python/swagger_client/models/cat.py
@@ -14,9 +14,9 @@
 import re  # noqa: F401
 
 import six
+from swagger_client.models.animal import Animal  # noqa: F401,E501
 
-
-class Cat(object):
+class Cat(Animal):
     """NOTE: This class is auto generated by the swagger code generator program.
 
     Do not edit the class manually.
@@ -29,78 +29,25 @@ class Cat(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'class_name': 'str',
-        'color': 'str',
         'declawed': 'bool'
     }
     if hasattr(Animal, "swagger_types"):
         swagger_types.update(Animal.swagger_types)
 
     attribute_map = {
-        'class_name': 'className',
-        'color': 'color',
         'declawed': 'declawed'
     }
     if hasattr(Animal, "attribute_map"):
         attribute_map.update(Animal.attribute_map)
 
-    def __init__(self, class_name=None, color='red', declawed=None, *args, **kwargs):  # noqa: E501
+    def __init__(self, declawed=None, *args, **kwargs):  # noqa: E501
         """Cat - a model defined in Swagger"""  # noqa: E501
-        self._class_name = None
-        self._color = None
         self._declawed = None
         self.discriminator = None
-        self.class_name = class_name
-        if color is not None:
-            self.color = color
         if declawed is not None:
             self.declawed = declawed
         Animal.__init__(self, *args, **kwargs)
 
-    @property
-    def class_name(self):
-        """Gets the class_name of this Cat.  # noqa: E501
-
-
-        :return: The class_name of this Cat.  # noqa: E501
-        :rtype: str
-        """
-        return self._class_name
-
-    @class_name.setter
-    def class_name(self, class_name):
-        """Sets the class_name of this Cat.
-
-
-        :param class_name: The class_name of this Cat.  # noqa: E501
-        :type: str
-        """
-        if class_name is None:
-            raise ValueError("Invalid value for `class_name`, must not be `None`")  # noqa: E501
-
-        self._class_name = class_name
-
-    @property
-    def color(self):
-        """Gets the color of this Cat.  # noqa: E501
-
-
-        :return: The color of this Cat.  # noqa: E501
-        :rtype: str
-        """
-        return self._color
-
-    @color.setter
-    def color(self, color):
-        """Sets the color of this Cat.
-
-
-        :param color: The color of this Cat.  # noqa: E501
-        :type: str
-        """
-
-        self._color = color
-
     @property
     def declawed(self):
         """Gets the declawed of this Cat.  # noqa: E501
diff --git a/samples/client/petstore/python/swagger_client/models/category.py b/samples/client/petstore/python/swagger_client/models/category.py
index 7ccb7b7e59c..a3bf5b35e2f 100644
--- a/samples/client/petstore/python/swagger_client/models/category.py
+++ b/samples/client/petstore/python/swagger_client/models/category.py
@@ -15,7 +15,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/swagger_client/models/class_model.py b/samples/client/petstore/python/swagger_client/models/class_model.py
index 44b69f1571f..9d9c102835a 100644
--- a/samples/client/petstore/python/swagger_client/models/class_model.py
+++ b/samples/client/petstore/python/swagger_client/models/class_model.py
@@ -15,7 +15,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/swagger_client/models/client.py b/samples/client/petstore/python/swagger_client/models/client.py
index 4080b1a734d..a63ded7cfe4 100644
--- a/samples/client/petstore/python/swagger_client/models/client.py
+++ b/samples/client/petstore/python/swagger_client/models/client.py
@@ -15,7 +15,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/swagger_client/models/dog.py b/samples/client/petstore/python/swagger_client/models/dog.py
index 13d871afaf5..ecd0b9e1a61 100644
--- a/samples/client/petstore/python/swagger_client/models/dog.py
+++ b/samples/client/petstore/python/swagger_client/models/dog.py
@@ -14,9 +14,9 @@
 import re  # noqa: F401
 
 import six
+from swagger_client.models.animal import Animal  # noqa: F401,E501
 
-
-class Dog(object):
+class Dog(Animal):
     """NOTE: This class is auto generated by the swagger code generator program.
 
     Do not edit the class manually.
@@ -29,78 +29,25 @@ class Dog(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'class_name': 'str',
-        'color': 'str',
         'breed': 'str'
     }
     if hasattr(Animal, "swagger_types"):
         swagger_types.update(Animal.swagger_types)
 
     attribute_map = {
-        'class_name': 'className',
-        'color': 'color',
         'breed': 'breed'
     }
     if hasattr(Animal, "attribute_map"):
         attribute_map.update(Animal.attribute_map)
 
-    def __init__(self, class_name=None, color='red', breed=None, *args, **kwargs):  # noqa: E501
+    def __init__(self, breed=None, *args, **kwargs):  # noqa: E501
         """Dog - a model defined in Swagger"""  # noqa: E501
-        self._class_name = None
-        self._color = None
         self._breed = None
         self.discriminator = None
-        self.class_name = class_name
-        if color is not None:
-            self.color = color
         if breed is not None:
             self.breed = breed
         Animal.__init__(self, *args, **kwargs)
 
-    @property
-    def class_name(self):
-        """Gets the class_name of this Dog.  # noqa: E501
-
-
-        :return: The class_name of this Dog.  # noqa: E501
-        :rtype: str
-        """
-        return self._class_name
-
-    @class_name.setter
-    def class_name(self, class_name):
-        """Sets the class_name of this Dog.
-
-
-        :param class_name: The class_name of this Dog.  # noqa: E501
-        :type: str
-        """
-        if class_name is None:
-            raise ValueError("Invalid value for `class_name`, must not be `None`")  # noqa: E501
-
-        self._class_name = class_name
-
-    @property
-    def color(self):
-        """Gets the color of this Dog.  # noqa: E501
-
-
-        :return: The color of this Dog.  # noqa: E501
-        :rtype: str
-        """
-        return self._color
-
-    @color.setter
-    def color(self, color):
-        """Sets the color of this Dog.
-
-
-        :param color: The color of this Dog.  # noqa: E501
-        :type: str
-        """
-
-        self._color = color
-
     @property
     def breed(self):
         """Gets the breed of this Dog.  # noqa: E501
diff --git a/samples/client/petstore/python/swagger_client/models/enum_arrays.py b/samples/client/petstore/python/swagger_client/models/enum_arrays.py
index b15551e14a6..8cb98c5e927 100644
--- a/samples/client/petstore/python/swagger_client/models/enum_arrays.py
+++ b/samples/client/petstore/python/swagger_client/models/enum_arrays.py
@@ -15,7 +15,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/swagger_client/models/enum_class.py b/samples/client/petstore/python/swagger_client/models/enum_class.py
index 8158d048743..45f36d0320d 100644
--- a/samples/client/petstore/python/swagger_client/models/enum_class.py
+++ b/samples/client/petstore/python/swagger_client/models/enum_class.py
@@ -15,7 +15,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/swagger_client/models/enum_test.py b/samples/client/petstore/python/swagger_client/models/enum_test.py
index 50eace382e9..05c2696db39 100644
--- a/samples/client/petstore/python/swagger_client/models/enum_test.py
+++ b/samples/client/petstore/python/swagger_client/models/enum_test.py
@@ -15,7 +15,6 @@
 
 import six
 
-
 class EnumTest(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python/swagger_client/models/format_test.py b/samples/client/petstore/python/swagger_client/models/format_test.py
index 7136ffcf6bd..44e1cc2a716 100644
--- a/samples/client/petstore/python/swagger_client/models/format_test.py
+++ b/samples/client/petstore/python/swagger_client/models/format_test.py
@@ -15,7 +15,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/swagger_client/models/has_only_read_only.py b/samples/client/petstore/python/swagger_client/models/has_only_read_only.py
index 2a6df64a6cd..828998dc8f2 100644
--- a/samples/client/petstore/python/swagger_client/models/has_only_read_only.py
+++ b/samples/client/petstore/python/swagger_client/models/has_only_read_only.py
@@ -15,7 +15,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/swagger_client/models/list.py b/samples/client/petstore/python/swagger_client/models/list.py
index 5d51b6543d5..d6288f845e4 100644
--- a/samples/client/petstore/python/swagger_client/models/list.py
+++ b/samples/client/petstore/python/swagger_client/models/list.py
@@ -15,7 +15,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/swagger_client/models/map_test.py b/samples/client/petstore/python/swagger_client/models/map_test.py
index c0184550da4..c675ae67dee 100644
--- a/samples/client/petstore/python/swagger_client/models/map_test.py
+++ b/samples/client/petstore/python/swagger_client/models/map_test.py
@@ -15,7 +15,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/swagger_client/models/mixed_properties_and_additional_properties_class.py b/samples/client/petstore/python/swagger_client/models/mixed_properties_and_additional_properties_class.py
index e563a533206..b2436f81a6f 100644
--- a/samples/client/petstore/python/swagger_client/models/mixed_properties_and_additional_properties_class.py
+++ b/samples/client/petstore/python/swagger_client/models/mixed_properties_and_additional_properties_class.py
@@ -15,7 +15,6 @@
 
 import six
 
-
 class MixedPropertiesAndAdditionalPropertiesClass(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python/swagger_client/models/model200_response.py b/samples/client/petstore/python/swagger_client/models/model200_response.py
index 1be5722928b..6ad022f62c0 100644
--- a/samples/client/petstore/python/swagger_client/models/model200_response.py
+++ b/samples/client/petstore/python/swagger_client/models/model200_response.py
@@ -15,7 +15,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/swagger_client/models/model_return.py b/samples/client/petstore/python/swagger_client/models/model_return.py
index 12fa1321579..b52bcb1e6b1 100644
--- a/samples/client/petstore/python/swagger_client/models/model_return.py
+++ b/samples/client/petstore/python/swagger_client/models/model_return.py
@@ -15,7 +15,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/swagger_client/models/name.py b/samples/client/petstore/python/swagger_client/models/name.py
index ca914f776e4..6d6a86760aa 100644
--- a/samples/client/petstore/python/swagger_client/models/name.py
+++ b/samples/client/petstore/python/swagger_client/models/name.py
@@ -15,7 +15,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/swagger_client/models/nullable_enum_model.py b/samples/client/petstore/python/swagger_client/models/nullable_enum_model.py
index d07d4798ada..fd5830f8c54 100644
--- a/samples/client/petstore/python/swagger_client/models/nullable_enum_model.py
+++ b/samples/client/petstore/python/swagger_client/models/nullable_enum_model.py
@@ -15,7 +15,6 @@
 
 import six
 
-
 class NullableEnumModel(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python/swagger_client/models/number_only.py b/samples/client/petstore/python/swagger_client/models/number_only.py
index c40f80b3b30..fa0e1c1f318 100644
--- a/samples/client/petstore/python/swagger_client/models/number_only.py
+++ b/samples/client/petstore/python/swagger_client/models/number_only.py
@@ -15,7 +15,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/swagger_client/models/one_of_all_pets_response_items.py b/samples/client/petstore/python/swagger_client/models/one_of_all_pets_response_items.py
index fb0127fef5b..076bc485e4c 100644
--- a/samples/client/petstore/python/swagger_client/models/one_of_all_pets_response_items.py
+++ b/samples/client/petstore/python/swagger_client/models/one_of_all_pets_response_items.py
@@ -15,7 +15,6 @@
 
 import six
 
-
 class OneOfAllPetsResponseItems(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python/swagger_client/models/one_of_single_pet_response_pet.py b/samples/client/petstore/python/swagger_client/models/one_of_single_pet_response_pet.py
index ee862bd2d84..9a8cfc4b849 100644
--- a/samples/client/petstore/python/swagger_client/models/one_of_single_pet_response_pet.py
+++ b/samples/client/petstore/python/swagger_client/models/one_of_single_pet_response_pet.py
@@ -15,7 +15,6 @@
 
 import six
 
-
 class OneOfSinglePetResponsePet(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python/swagger_client/models/order.py b/samples/client/petstore/python/swagger_client/models/order.py
index da3e6f40f3c..178c282849e 100644
--- a/samples/client/petstore/python/swagger_client/models/order.py
+++ b/samples/client/petstore/python/swagger_client/models/order.py
@@ -15,7 +15,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/swagger_client/models/outer_boolean.py b/samples/client/petstore/python/swagger_client/models/outer_boolean.py
index 064510cedf6..5c5df37dd65 100644
--- a/samples/client/petstore/python/swagger_client/models/outer_boolean.py
+++ b/samples/client/petstore/python/swagger_client/models/outer_boolean.py
@@ -15,7 +15,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/swagger_client/models/outer_composite.py b/samples/client/petstore/python/swagger_client/models/outer_composite.py
index acabbf98bfb..0f3692dec9e 100644
--- a/samples/client/petstore/python/swagger_client/models/outer_composite.py
+++ b/samples/client/petstore/python/swagger_client/models/outer_composite.py
@@ -15,7 +15,6 @@
 
 import six
 
-
 class OuterComposite(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python/swagger_client/models/outer_enum.py b/samples/client/petstore/python/swagger_client/models/outer_enum.py
index 879e3a8d322..100bb1857cf 100644
--- a/samples/client/petstore/python/swagger_client/models/outer_enum.py
+++ b/samples/client/petstore/python/swagger_client/models/outer_enum.py
@@ -15,7 +15,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/swagger_client/models/outer_number.py b/samples/client/petstore/python/swagger_client/models/outer_number.py
index 6dd01c5dd15..a36793d7b6b 100644
--- a/samples/client/petstore/python/swagger_client/models/outer_number.py
+++ b/samples/client/petstore/python/swagger_client/models/outer_number.py
@@ -15,7 +15,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/swagger_client/models/outer_string.py b/samples/client/petstore/python/swagger_client/models/outer_string.py
index a71ec28e86d..01eac928587 100644
--- a/samples/client/petstore/python/swagger_client/models/outer_string.py
+++ b/samples/client/petstore/python/swagger_client/models/outer_string.py
@@ -15,7 +15,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/swagger_client/models/pet.py b/samples/client/petstore/python/swagger_client/models/pet.py
index 31d90fea204..38a9466b2a8 100644
--- a/samples/client/petstore/python/swagger_client/models/pet.py
+++ b/samples/client/petstore/python/swagger_client/models/pet.py
@@ -15,7 +15,6 @@
 
 import six
 
-
 class Pet(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python/swagger_client/models/read_only_first.py b/samples/client/petstore/python/swagger_client/models/read_only_first.py
index bfdff46aae8..632bb97a25d 100644
--- a/samples/client/petstore/python/swagger_client/models/read_only_first.py
+++ b/samples/client/petstore/python/swagger_client/models/read_only_first.py
@@ -15,7 +15,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/swagger_client/models/single_pet_response.py b/samples/client/petstore/python/swagger_client/models/single_pet_response.py
index f34d71aa811..e03cb0daf1d 100644
--- a/samples/client/petstore/python/swagger_client/models/single_pet_response.py
+++ b/samples/client/petstore/python/swagger_client/models/single_pet_response.py
@@ -15,7 +15,6 @@
 
 import six
 
-
 class SinglePetResponse(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python/swagger_client/models/special_model_name.py b/samples/client/petstore/python/swagger_client/models/special_model_name.py
index d495ffcf4e1..4c0ce261786 100644
--- a/samples/client/petstore/python/swagger_client/models/special_model_name.py
+++ b/samples/client/petstore/python/swagger_client/models/special_model_name.py
@@ -15,7 +15,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/swagger_client/models/sub_category.py b/samples/client/petstore/python/swagger_client/models/sub_category.py
index a6f8b02ee28..a83f929d70f 100644
--- a/samples/client/petstore/python/swagger_client/models/sub_category.py
+++ b/samples/client/petstore/python/swagger_client/models/sub_category.py
@@ -15,7 +15,6 @@
 
 import six
 
-
 class SubCategory(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
diff --git a/samples/client/petstore/python/swagger_client/models/tag.py b/samples/client/petstore/python/swagger_client/models/tag.py
index 3ccd79ee98e..d487fa0e69a 100644
--- a/samples/client/petstore/python/swagger_client/models/tag.py
+++ b/samples/client/petstore/python/swagger_client/models/tag.py
@@ -15,7 +15,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/swagger_client/models/user.py b/samples/client/petstore/python/swagger_client/models/user.py
index d2bd07f2374..182a5fab569 100644
--- a/samples/client/petstore/python/swagger_client/models/user.py
+++ b/samples/client/petstore/python/swagger_client/models/user.py
@@ -15,7 +15,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/swagger_client/rest.py b/samples/client/petstore/python/swagger_client/rest.py
index 9c694eddd07..f902c7377a7 100644
--- a/samples/client/petstore/python/swagger_client/rest.py
+++ b/samples/client/petstore/python/swagger_client/rest.py
@@ -155,7 +155,7 @@ def request(self, method, url, query_params=None, headers=None,
                 if query_params:
                     url += '?' + urlencode(query_params)
                 if re.search('json', headers['Content-Type'], re.IGNORECASE):
-                    request_body = None
+                    request_body = '{}'
                     if body is not None:
                         request_body = json.dumps(body)
                     r = self.pool_manager.request(
diff --git a/samples/client/petstore/python/tox.ini b/samples/client/petstore/python/tox.ini
index 3d0be613cfc..a310bec97d6 100644
--- a/samples/client/petstore/python/tox.ini
+++ b/samples/client/petstore/python/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27, py3
+envlist = py3
 
 [testenv]
 deps=-r{toxinidir}/requirements.txt