Merge pull request #8900 from AlexInGitHub/master

 fix the polymorphic issue

Author: HugoMario

modules/swagger-codegen/src/main/resources/python/api_client.mustache

@@ -597,6 +597,9 @@ class ApiClient(object):
                 )
             )
 
+    def __hasattr(self, object, name):
+            return name in object.__class__.__dict__
+
     def __deserialize_model(self, data, klass):
         """Deserializes list or dict to model.
 
@@ -605,8 +608,7 @@ class ApiClient(object):
         :return: model object.
         """
 
-        if not klass.swagger_types and not hasattr(klass,
-                                                   'get_real_child_model'):
+        if not klass.swagger_types and not self.__hasattr(klass, 'get_real_child_model'):
             return data
 
         kwargs = {}
@@ -626,7 +628,7 @@ class ApiClient(object):
             for key, value in data.items():
                 if key not in klass.swagger_types:
                     instance[key] = value
-        if hasattr(instance, 'get_real_child_model'):
+        if self.__hasattr(instance, 'get_real_child_model'):
             klass_name = instance.get_real_child_model(data)
             if klass_name:
                 instance = self.__deserialize(data, klass_name)

samples/client/petstore-security-test/python/petstore_api/api/fake_api.py

@@ -34,43 +34,43 @@ def __init__(self, api_client=None):
         self.api_client = api_client
 
     def test_code_inject____end__rn_n_r(self, **kwargs):  # noqa: E501
-        """To test code injection */ ' \" =end -- \\r\\n \\n \\r  # noqa: E501
+        """To test code injection */ ' \" =end -- \\r\\n \\n \\r  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.test_code_inject____end__rn_n_r(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.test_code_inject____end__rn_n_r(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str test_code_inject____end____rn_n_r: To test code injection */ ' \" =end -- \\r\\n \\n \\r
         :return: None
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.test_code_inject____end__rn_n_r_with_http_info(**kwargs)  # noqa: E501
         else:
             (data) = self.test_code_inject____end__rn_n_r_with_http_info(**kwargs)  # noqa: E501
             return data
 
     def test_code_inject____end__rn_n_r_with_http_info(self, **kwargs):  # noqa: E501
-        """To test code injection */ ' \" =end -- \\r\\n \\n \\r  # noqa: E501
+        """To test code injection */ ' \" =end -- \\r\\n \\n \\r  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.test_code_inject____end__rn_n_r_with_http_info(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.test_code_inject____end__rn_n_r_with_http_info(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str test_code_inject____end____rn_n_r: To test code injection */ ' \" =end -- \\r\\n \\n \\r
         :return: None
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
         all_params = ['test_code_inject____end____rn_n_r']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -120,7 +120,7 @@ def test_code_inject____end__rn_n_r_with_http_info(self, **kwargs):  # noqa: E50
             files=local_var_files,
             response_type=None,  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),

samples/client/petstore-security-test/python/petstore_api/api_client.py

@@ -245,12 +245,12 @@ def __deserialize(self, data, klass):
 
         if type(klass) == str:
             if klass.startswith('list['):
-                sub_kls = re.match('list\[(.*)\]', klass).group(1)
+                sub_kls = re.match(r'list\[(.*)\]', klass).group(1)
                 return [self.__deserialize(sub_data, sub_kls)
                         for sub_data in data]
 
             if klass.startswith('dict('):
-                sub_kls = re.match('dict\(([^,]*), (.*)\)', klass).group(2)
+                sub_kls = re.match(r'dict\(([^,]*), (.*)\)', klass).group(2)
                 return {k: self.__deserialize(v, sub_kls)
                         for k, v in six.iteritems(data)}
 
@@ -274,12 +274,12 @@ def __deserialize(self, data, klass):
     def call_api(self, resource_path, method,
                  path_params=None, query_params=None, header_params=None,
                  body=None, post_params=None, files=None,
-                 response_type=None, auth_settings=None, async=None,
+                 response_type=None, auth_settings=None, async_req=None,
                  _return_http_data_only=None, collection_formats=None,
                  _preload_content=True, _request_timeout=None):
         """Makes the HTTP request (synchronous) and returns deserialized data.
 
-        To make an async request, set the async parameter.
+        To make an async request, set the async_req parameter.
 
         :param resource_path: Path to method endpoint.
         :param method: Method to call.
@@ -294,7 +294,7 @@ def call_api(self, resource_path, method,
         :param response: Response data type.
         :param files dict: key -> filename, value -> filepath,
             for `multipart/form-data`.
-        :param async bool: execute request asynchronously
+        :param async_req bool: execute request asynchronously
         :param _return_http_data_only: response data without head status code
                                        and headers
         :param collection_formats: dict of collection formats for path, query,
@@ -307,13 +307,13 @@ def call_api(self, resource_path, method,
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
         :return:
-            If async parameter is True,
+            If async_req parameter is True,
             the request will be called asynchronously.
             The method will return the request thread.
-            If parameter async is False or missing,
+            If parameter async_req is False or missing,
             then the method will return the response directly.
         """
-        if not async:
+        if not async_req:
             return self.__call_api(resource_path, method,
                                    path_params, query_params, header_params,
                                    body, post_params, files,
@@ -591,6 +591,9 @@ def __deserialize_datatime(self, string):
                 )
             )
 
+    def __hasattr(self, object, name):
+            return name in object.__class__.__dict__
+
     def __deserialize_model(self, data, klass):
         """Deserializes list or dict to model.
 
@@ -599,8 +602,7 @@ def __deserialize_model(self, data, klass):
         :return: model object.
         """
 
-        if not klass.swagger_types and not hasattr(klass,
-                                                   'get_real_child_model'):
+        if not klass.swagger_types and not self.__hasattr(klass, 'get_real_child_model'):
             return data
 
         kwargs = {}
@@ -620,7 +622,7 @@ def __deserialize_model(self, data, klass):
             for key, value in data.items():
                 if key not in klass.swagger_types:
                     instance[key] = value
-        if hasattr(instance, 'get_real_child_model'):
+        if self.__hasattr(instance, 'get_real_child_model'):
             klass_name = instance.get_real_child_model(data)
             if klass_name:
                 instance = self.__deserialize(data, klass_name)

samples/client/petstore/python/petstore_api/api_client.py

@@ -591,6 +591,9 @@ def __deserialize_datatime(self, string):
                 )
             )
 
+    def __hasattr(self, object, name):
+            return name in object.__class__.__dict__
+
     def __deserialize_model(self, data, klass):
         """Deserializes list or dict to model.
 
@@ -599,8 +602,7 @@ def __deserialize_model(self, data, klass):
         :return: model object.
         """
 
-        if not klass.swagger_types and not hasattr(klass,
-                                                   'get_real_child_model'):
+        if not klass.swagger_types and not self.__hasattr(klass, 'get_real_child_model'):
             return data
 
         kwargs = {}
@@ -620,7 +622,7 @@ def __deserialize_model(self, data, klass):
             for key, value in data.items():
                 if key not in klass.swagger_types:
                     instance[key] = value
-        if hasattr(instance, 'get_real_child_model'):
+        if self.__hasattr(instance, 'get_real_child_model'):
             klass_name = instance.get_real_child_model(data)
             if klass_name:
                 instance = self.__deserialize(data, klass_name)