Merge remote-tracking branch 'origin/master' into 5.0.x

samples/client/petstore/python/README.md

@@ -46,14 +46,20 @@ Please follow the [installation procedure](#installation--usage) and then run th
 
 ```python
 from __future__ import print_function
+
 import time
 import petstore_api
 from petstore_api.rest import ApiException
 from pprint import pprint
 
+# Defining the host is optional and defaults to http://petstore.swagger.io:80/v2
+# See configuration.py for a list of all supported configuration parameters.
+configuration = petstore_api.Configuration(
+    host = "http://petstore.swagger.io:80/v2"
+)
+
+
 
-# Defining host is optional and default to http://petstore.swagger.io:80/v2
-configuration.host = "http://petstore.swagger.io:80/v2"
 # Enter a context with an instance of the API client
 with petstore_api.ApiClient(configuration) as api_client:
     # Create an instance of the API class

samples/client/petstore/python/docs/AnotherFakeApi.md

@@ -22,6 +22,12 @@ import time
 import petstore_api
 from petstore_api.rest import ApiException
 from pprint import pprint
+# Defining the host is optional and defaults to http://petstore.swagger.io:80/v2
+# See configuration.py for a list of all supported configuration parameters.
+configuration = petstore_api.Configuration(
+    host = "http://petstore.swagger.io:80/v2"
+)
+
 
 # Enter a context with an instance of the API client
 with petstore_api.ApiClient() as api_client:

samples/client/petstore/python/docs/FakeApi.md

@@ -35,6 +35,12 @@ import time
 import petstore_api
 from petstore_api.rest import ApiException
 from pprint import pprint
+# Defining the host is optional and defaults to http://petstore.swagger.io:80/v2
+# See configuration.py for a list of all supported configuration parameters.
+configuration = petstore_api.Configuration(
+    host = "http://petstore.swagger.io:80/v2"
+)
+
 
 # Enter a context with an instance of the API client
 with petstore_api.ApiClient() as api_client:
@@ -90,6 +96,12 @@ import time
 import petstore_api
 from petstore_api.rest import ApiException
 from pprint import pprint
+# Defining the host is optional and defaults to http://petstore.swagger.io:80/v2
+# See configuration.py for a list of all supported configuration parameters.
+configuration = petstore_api.Configuration(
+    host = "http://petstore.swagger.io:80/v2"
+)
+
 
 # Enter a context with an instance of the API client
 with petstore_api.ApiClient() as api_client:
@@ -145,6 +157,12 @@ import time
 import petstore_api
 from petstore_api.rest import ApiException
 from pprint import pprint
+# Defining the host is optional and defaults to http://petstore.swagger.io:80/v2
+# See configuration.py for a list of all supported configuration parameters.
+configuration = petstore_api.Configuration(
+    host = "http://petstore.swagger.io:80/v2"
+)
+
 
 # Enter a context with an instance of the API client
 with petstore_api.ApiClient() as api_client:
@@ -200,6 +218,12 @@ import time
 import petstore_api
 from petstore_api.rest import ApiException
 from pprint import pprint
+# Defining the host is optional and defaults to http://petstore.swagger.io:80/v2
+# See configuration.py for a list of all supported configuration parameters.
+configuration = petstore_api.Configuration(
+    host = "http://petstore.swagger.io:80/v2"
+)
+
 
 # Enter a context with an instance of the API client
 with petstore_api.ApiClient() as api_client:
@@ -255,6 +279,12 @@ import time
 import petstore_api
 from petstore_api.rest import ApiException
 from pprint import pprint
+# Defining the host is optional and defaults to http://petstore.swagger.io:80/v2
+# See configuration.py for a list of all supported configuration parameters.
+configuration = petstore_api.Configuration(
+    host = "http://petstore.swagger.io:80/v2"
+)
+
 
 # Enter a context with an instance of the API client
 with petstore_api.ApiClient() as api_client:
@@ -310,6 +340,12 @@ import time
 import petstore_api
 from petstore_api.rest import ApiException
 from pprint import pprint
+# Defining the host is optional and defaults to http://petstore.swagger.io:80/v2
+# See configuration.py for a list of all supported configuration parameters.
+configuration = petstore_api.Configuration(
+    host = "http://petstore.swagger.io:80/v2"
+)
+
 
 # Enter a context with an instance of the API client
 with petstore_api.ApiClient() as api_client:
@@ -362,6 +398,12 @@ import time
 import petstore_api
 from petstore_api.rest import ApiException
 from pprint import pprint
+# Defining the host is optional and defaults to http://petstore.swagger.io:80/v2
+# See configuration.py for a list of all supported configuration parameters.
+configuration = petstore_api.Configuration(
+    host = "http://petstore.swagger.io:80/v2"
+)
+
 
 # Enter a context with an instance of the API client
 with petstore_api.ApiClient() as api_client:
@@ -418,6 +460,12 @@ import time
 import petstore_api
 from petstore_api.rest import ApiException
 from pprint import pprint
+# Defining the host is optional and defaults to http://petstore.swagger.io:80/v2
+# See configuration.py for a list of all supported configuration parameters.
+configuration = petstore_api.Configuration(
+    host = "http://petstore.swagger.io:80/v2"
+)
+
 
 # Enter a context with an instance of the API client
 with petstore_api.ApiClient() as api_client:
@@ -475,13 +523,22 @@ import time
 import petstore_api
 from petstore_api.rest import ApiException
 from pprint import pprint
-configuration = petstore_api.Configuration()
-# Configure HTTP basic authorization: http_basic_test
-configuration.username = 'YOUR_USERNAME'
-configuration.password = 'YOUR_PASSWORD'
+# Defining the host is optional and defaults to http://petstore.swagger.io:80/v2
+# See configuration.py for a list of all supported configuration parameters.
+configuration = petstore_api.Configuration(
+    host = "http://petstore.swagger.io:80/v2"
+)
 
-# Defining host is optional and default to http://petstore.swagger.io:80/v2
-configuration.host = "http://petstore.swagger.io:80/v2"
+# The client must configure the authentication and authorization parameters
+# in accordance with the API server security policy.
+# Examples for each auth method are provided below, use the example that
+# satisfies your auth use case.
+
+# Configure HTTP basic authorization: http_basic_test
+configuration = petstore_api.Configuration(
+    username = 'YOUR_USERNAME',
+    password = 'YOUR_PASSWORD'
+)
 
 # Enter a context with an instance of the API client
 with petstore_api.ApiClient(configuration) as api_client:
@@ -564,6 +621,12 @@ import time
 import petstore_api
 from petstore_api.rest import ApiException
 from pprint import pprint
+# Defining the host is optional and defaults to http://petstore.swagger.io:80/v2
+# See configuration.py for a list of all supported configuration parameters.
+configuration = petstore_api.Configuration(
+    host = "http://petstore.swagger.io:80/v2"
+)
+
 
 # Enter a context with an instance of the API client
 with petstore_api.ApiClient() as api_client:
@@ -634,6 +697,12 @@ import time
 import petstore_api
 from petstore_api.rest import ApiException
 from pprint import pprint
+# Defining the host is optional and defaults to http://petstore.swagger.io:80/v2
+# See configuration.py for a list of all supported configuration parameters.
+configuration = petstore_api.Configuration(
+    host = "http://petstore.swagger.io:80/v2"
+)
+
 
 # Enter a context with an instance of the API client
 with petstore_api.ApiClient() as api_client:
@@ -697,6 +766,12 @@ import time
 import petstore_api
 from petstore_api.rest import ApiException
 from pprint import pprint
+# Defining the host is optional and defaults to http://petstore.swagger.io:80/v2
+# See configuration.py for a list of all supported configuration parameters.
+configuration = petstore_api.Configuration(
+    host = "http://petstore.swagger.io:80/v2"
+)
+
 
 # Enter a context with an instance of the API client
 with petstore_api.ApiClient() as api_client:
@@ -750,6 +825,12 @@ import time
 import petstore_api
 from petstore_api.rest import ApiException
 from pprint import pprint
+# Defining the host is optional and defaults to http://petstore.swagger.io:80/v2
+# See configuration.py for a list of all supported configuration parameters.
+configuration = petstore_api.Configuration(
+    host = "http://petstore.swagger.io:80/v2"
+)
+
 
 # Enter a context with an instance of the API client
 with petstore_api.ApiClient() as api_client:
@@ -807,6 +888,12 @@ import time
 import petstore_api
 from petstore_api.rest import ApiException
 from pprint import pprint
+# Defining the host is optional and defaults to http://petstore.swagger.io:80/v2
+# See configuration.py for a list of all supported configuration parameters.
+configuration = petstore_api.Configuration(
+    host = "http://petstore.swagger.io:80/v2"
+)
+
 
 # Enter a context with an instance of the API client
 with petstore_api.ApiClient() as api_client:

samples/client/petstore/python/docs/FakeClassnameTags123Api.md

@@ -23,15 +23,27 @@ import time
 import petstore_api
 from petstore_api.rest import ApiException
 from pprint import pprint
-configuration = petstore_api.Configuration()
+# Defining the host is optional and defaults to http://petstore.swagger.io:80/v2
+# See configuration.py for a list of all supported configuration parameters.
+configuration = petstore_api.Configuration(
+    host = "http://petstore.swagger.io:80/v2"
+)
+
+# The client must configure the authentication and authorization parameters
+# in accordance with the API server security policy.
+# Examples for each auth method are provided below, use the example that
+# satisfies your auth use case.
+
 # Configure API key authorization: api_key_query
-configuration.api_key['api_key_query'] = 'YOUR_API_KEY'
+configuration = petstore_api.Configuration(
+    host = "http://petstore.swagger.io:80/v2",
+    api_key = {
+        'api_key_query': 'YOUR_API_KEY'
+    }
+)
 # Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
 # configuration.api_key_prefix['api_key_query'] = 'Bearer'
 
-# Defining host is optional and default to http://petstore.swagger.io:80/v2
-configuration.host = "http://petstore.swagger.io:80/v2"
-
 # Enter a context with an instance of the API client
 with petstore_api.ApiClient(configuration) as api_client:
     # Create an instance of the API class

samples/client/petstore/python/docs/PetApi.md

@@ -29,12 +29,22 @@ import time
 import petstore_api
 from petstore_api.rest import ApiException
 from pprint import pprint
-configuration = petstore_api.Configuration()
-# Configure OAuth2 access token for authorization: petstore_auth
-configuration.access_token = 'YOUR_ACCESS_TOKEN'
+# Defining the host is optional and defaults to http://petstore.swagger.io:80/v2
+# See configuration.py for a list of all supported configuration parameters.
+configuration = petstore_api.Configuration(
+    host = "http://petstore.swagger.io:80/v2"
+)
 
-# Defining host is optional and default to http://petstore.swagger.io:80/v2
-configuration.host = "http://petstore.swagger.io:80/v2"
+# The client must configure the authentication and authorization parameters
+# in accordance with the API server security policy.
+# Examples for each auth method are provided below, use the example that
+# satisfies your auth use case.
+
+# Configure OAuth2 access token for authorization: petstore_auth
+configuration = petstore_api.Configuration(
+    host = "http://petstore.swagger.io:80/v2"
+)
+configuration.access_token = 'YOUR_ACCESS_TOKEN'
 
 # Enter a context with an instance of the API client
 with petstore_api.ApiClient(configuration) as api_client:
@@ -90,12 +100,22 @@ import time
 import petstore_api
 from petstore_api.rest import ApiException
 from pprint import pprint
-configuration = petstore_api.Configuration()
-# Configure OAuth2 access token for authorization: petstore_auth
-configuration.access_token = 'YOUR_ACCESS_TOKEN'
+# Defining the host is optional and defaults to http://petstore.swagger.io:80/v2
+# See configuration.py for a list of all supported configuration parameters.
+configuration = petstore_api.Configuration(
+    host = "http://petstore.swagger.io:80/v2"
+)
 
-# Defining host is optional and default to http://petstore.swagger.io:80/v2
-configuration.host = "http://petstore.swagger.io:80/v2"
+# The client must configure the authentication and authorization parameters
+# in accordance with the API server security policy.
+# Examples for each auth method are provided below, use the example that
+# satisfies your auth use case.
+
+# Configure OAuth2 access token for authorization: petstore_auth
+configuration = petstore_api.Configuration(
+    host = "http://petstore.swagger.io:80/v2"
+)
+configuration.access_token = 'YOUR_ACCESS_TOKEN'
 
 # Enter a context with an instance of the API client
 with petstore_api.ApiClient(configuration) as api_client:
@@ -155,12 +175,22 @@ import time
 import petstore_api
 from petstore_api.rest import ApiException
 from pprint import pprint
-configuration = petstore_api.Configuration()
-# Configure OAuth2 access token for authorization: petstore_auth
-configuration.access_token = 'YOUR_ACCESS_TOKEN'
+# Defining the host is optional and defaults to http://petstore.swagger.io:80/v2
+# See configuration.py for a list of all supported configuration parameters.
+configuration = petstore_api.Configuration(
+    host = "http://petstore.swagger.io:80/v2"
+)
 
-# Defining host is optional and default to http://petstore.swagger.io:80/v2
-configuration.host = "http://petstore.swagger.io:80/v2"
+# The client must configure the authentication and authorization parameters
+# in accordance with the API server security policy.
+# Examples for each auth method are provided below, use the example that
+# satisfies your auth use case.
+
+# Configure OAuth2 access token for authorization: petstore_auth
+configuration = petstore_api.Configuration(
+    host = "http://petstore.swagger.io:80/v2"
+)
+configuration.access_token = 'YOUR_ACCESS_TOKEN'
 
 # Enter a context with an instance of the API client
 with petstore_api.ApiClient(configuration) as api_client:
@@ -219,12 +249,22 @@ import time
 import petstore_api
 from petstore_api.rest import ApiException
 from pprint import pprint
-configuration = petstore_api.Configuration()
-# Configure OAuth2 access token for authorization: petstore_auth
-configuration.access_token = 'YOUR_ACCESS_TOKEN'
+# Defining the host is optional and defaults to http://petstore.swagger.io:80/v2
+# See configuration.py for a list of all supported configuration parameters.
+configuration = petstore_api.Configuration(
+    host = "http://petstore.swagger.io:80/v2"
+)
 
-# Defining host is optional and default to http://petstore.swagger.io:80/v2
-configuration.host = "http://petstore.swagger.io:80/v2"
+# The client must configure the authentication and authorization parameters
+# in accordance with the API server security policy.
+# Examples for each auth method are provided below, use the example that
+# satisfies your auth use case.
+
+# Configure OAuth2 access token for authorization: petstore_auth
+configuration = petstore_api.Configuration(
+    host = "http://petstore.swagger.io:80/v2"
+)
+configuration.access_token = 'YOUR_ACCESS_TOKEN'
 
 # Enter a context with an instance of the API client
 with petstore_api.ApiClient(configuration) as api_client:
@@ -283,15 +323,27 @@ import time
 import petstore_api
 from petstore_api.rest import ApiException
 from pprint import pprint
-configuration = petstore_api.Configuration()
+# Defining the host is optional and defaults to http://petstore.swagger.io:80/v2
+# See configuration.py for a list of all supported configuration parameters.
+configuration = petstore_api.Configuration(
+    host = "http://petstore.swagger.io:80/v2"
+)
+
+# The client must configure the authentication and authorization parameters
+# in accordance with the API server security policy.
+# Examples for each auth method are provided below, use the example that
+# satisfies your auth use case.
+
 # Configure API key authorization: api_key
-configuration.api_key['api_key'] = 'YOUR_API_KEY'
+configuration = petstore_api.Configuration(
+    host = "http://petstore.swagger.io:80/v2",
+    api_key = {
+        'api_key': 'YOUR_API_KEY'
+    }
+)
 # Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
 # configuration.api_key_prefix['api_key'] = 'Bearer'
 
-# Defining host is optional and default to http://petstore.swagger.io:80/v2
-configuration.host = "http://petstore.swagger.io:80/v2"
-
 # Enter a context with an instance of the API client
 with petstore_api.ApiClient(configuration) as api_client:
     # Create an instance of the API class
@@ -348,12 +400,22 @@ import time
 import petstore_api
 from petstore_api.rest import ApiException
 from pprint import pprint
-configuration = petstore_api.Configuration()
-# Configure OAuth2 access token for authorization: petstore_auth
-configuration.access_token = 'YOUR_ACCESS_TOKEN'
+# Defining the host is optional and defaults to http://petstore.swagger.io:80/v2
+# See configuration.py for a list of all supported configuration parameters.
+configuration = petstore_api.Configuration(
+    host = "http://petstore.swagger.io:80/v2"
+)
 
-# Defining host is optional and default to http://petstore.swagger.io:80/v2
-configuration.host = "http://petstore.swagger.io:80/v2"
+# The client must configure the authentication and authorization parameters
+# in accordance with the API server security policy.
+# Examples for each auth method are provided below, use the example that
+# satisfies your auth use case.
+
+# Configure OAuth2 access token for authorization: petstore_auth
+configuration = petstore_api.Configuration(
+    host = "http://petstore.swagger.io:80/v2"
+)
+configuration.access_token = 'YOUR_ACCESS_TOKEN'
 
 # Enter a context with an instance of the API client
 with petstore_api.ApiClient(configuration) as api_client:
@@ -411,12 +473,22 @@ import time
 import petstore_api
 from petstore_api.rest import ApiException
 from pprint import pprint
-configuration = petstore_api.Configuration()
-# Configure OAuth2 access token for authorization: petstore_auth
-configuration.access_token = 'YOUR_ACCESS_TOKEN'
+# Defining the host is optional and defaults to http://petstore.swagger.io:80/v2
+# See configuration.py for a list of all supported configuration parameters.
+configuration = petstore_api.Configuration(
+    host = "http://petstore.swagger.io:80/v2"
+)
 
-# Defining host is optional and default to http://petstore.swagger.io:80/v2
-configuration.host = "http://petstore.swagger.io:80/v2"
+# The client must configure the authentication and authorization parameters
+# in accordance with the API server security policy.
+# Examples for each auth method are provided below, use the example that
+# satisfies your auth use case.
+
+# Configure OAuth2 access token for authorization: petstore_auth
+configuration = petstore_api.Configuration(
+    host = "http://petstore.swagger.io:80/v2"
+)
+configuration.access_token = 'YOUR_ACCESS_TOKEN'
 
 # Enter a context with an instance of the API client
 with petstore_api.ApiClient(configuration) as api_client:
@@ -475,12 +547,22 @@ import time
 import petstore_api
 from petstore_api.rest import ApiException
 from pprint import pprint
-configuration = petstore_api.Configuration()
-# Configure OAuth2 access token for authorization: petstore_auth
-configuration.access_token = 'YOUR_ACCESS_TOKEN'
+# Defining the host is optional and defaults to http://petstore.swagger.io:80/v2
+# See configuration.py for a list of all supported configuration parameters.
+configuration = petstore_api.Configuration(
+    host = "http://petstore.swagger.io:80/v2"
+)
 
-# Defining host is optional and default to http://petstore.swagger.io:80/v2
-configuration.host = "http://petstore.swagger.io:80/v2"
+# The client must configure the authentication and authorization parameters
+# in accordance with the API server security policy.
+# Examples for each auth method are provided below, use the example that
+# satisfies your auth use case.
+
+# Configure OAuth2 access token for authorization: petstore_auth
+configuration = petstore_api.Configuration(
+    host = "http://petstore.swagger.io:80/v2"
+)
+configuration.access_token = 'YOUR_ACCESS_TOKEN'
 
 # Enter a context with an instance of the API client
 with petstore_api.ApiClient(configuration) as api_client:
@@ -540,12 +622,22 @@ import time
 import petstore_api
 from petstore_api.rest import ApiException
 from pprint import pprint
-configuration = petstore_api.Configuration()
-# Configure OAuth2 access token for authorization: petstore_auth
-configuration.access_token = 'YOUR_ACCESS_TOKEN'
+# Defining the host is optional and defaults to http://petstore.swagger.io:80/v2
+# See configuration.py for a list of all supported configuration parameters.
+configuration = petstore_api.Configuration(
+    host = "http://petstore.swagger.io:80/v2"
+)
 
-# Defining host is optional and default to http://petstore.swagger.io:80/v2
-configuration.host = "http://petstore.swagger.io:80/v2"
+# The client must configure the authentication and authorization parameters
+# in accordance with the API server security policy.
+# Examples for each auth method are provided below, use the example that
+# satisfies your auth use case.
+
+# Configure OAuth2 access token for authorization: petstore_auth
+configuration = petstore_api.Configuration(
+    host = "http://petstore.swagger.io:80/v2"
+)
+configuration.access_token = 'YOUR_ACCESS_TOKEN'
 
 # Enter a context with an instance of the API client
 with petstore_api.ApiClient(configuration) as api_client:

samples/client/petstore/python/docs/StoreApi.md

@@ -25,6 +25,12 @@ import time
 import petstore_api
 from petstore_api.rest import ApiException
 from pprint import pprint
+# Defining the host is optional and defaults to http://petstore.swagger.io:80/v2
+# See configuration.py for a list of all supported configuration parameters.
+configuration = petstore_api.Configuration(
+    host = "http://petstore.swagger.io:80/v2"
+)
+
 
 # Enter a context with an instance of the API client
 with petstore_api.ApiClient() as api_client:
@@ -82,15 +88,27 @@ import time
 import petstore_api
 from petstore_api.rest import ApiException
 from pprint import pprint
-configuration = petstore_api.Configuration()
+# Defining the host is optional and defaults to http://petstore.swagger.io:80/v2
+# See configuration.py for a list of all supported configuration parameters.
+configuration = petstore_api.Configuration(
+    host = "http://petstore.swagger.io:80/v2"
+)
+
+# The client must configure the authentication and authorization parameters
+# in accordance with the API server security policy.
+# Examples for each auth method are provided below, use the example that
+# satisfies your auth use case.
+
 # Configure API key authorization: api_key
-configuration.api_key['api_key'] = 'YOUR_API_KEY'
+configuration = petstore_api.Configuration(
+    host = "http://petstore.swagger.io:80/v2",
+    api_key = {
+        'api_key': 'YOUR_API_KEY'
+    }
+)
 # Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
 # configuration.api_key_prefix['api_key'] = 'Bearer'
 
-# Defining host is optional and default to http://petstore.swagger.io:80/v2
-configuration.host = "http://petstore.swagger.io:80/v2"
-
 # Enter a context with an instance of the API client
 with petstore_api.ApiClient(configuration) as api_client:
     # Create an instance of the API class
@@ -142,6 +160,12 @@ import time
 import petstore_api
 from petstore_api.rest import ApiException
 from pprint import pprint
+# Defining the host is optional and defaults to http://petstore.swagger.io:80/v2
+# See configuration.py for a list of all supported configuration parameters.
+configuration = petstore_api.Configuration(
+    host = "http://petstore.swagger.io:80/v2"
+)
+
 
 # Enter a context with an instance of the API client
 with petstore_api.ApiClient() as api_client:
@@ -198,6 +222,12 @@ import time
 import petstore_api
 from petstore_api.rest import ApiException
 from pprint import pprint
+# Defining the host is optional and defaults to http://petstore.swagger.io:80/v2
+# See configuration.py for a list of all supported configuration parameters.
+configuration = petstore_api.Configuration(
+    host = "http://petstore.swagger.io:80/v2"
+)
+
 
 # Enter a context with an instance of the API client
 with petstore_api.ApiClient() as api_client:

samples/client/petstore/python/docs/UserApi.md

@@ -29,6 +29,12 @@ import time
 import petstore_api
 from petstore_api.rest import ApiException
 from pprint import pprint
+# Defining the host is optional and defaults to http://petstore.swagger.io:80/v2
+# See configuration.py for a list of all supported configuration parameters.
+configuration = petstore_api.Configuration(
+    host = "http://petstore.swagger.io:80/v2"
+)
+
 
 # Enter a context with an instance of the API client
 with petstore_api.ApiClient() as api_client:
@@ -82,6 +88,12 @@ import time
 import petstore_api
 from petstore_api.rest import ApiException
 from pprint import pprint
+# Defining the host is optional and defaults to http://petstore.swagger.io:80/v2
+# See configuration.py for a list of all supported configuration parameters.
+configuration = petstore_api.Configuration(
+    host = "http://petstore.swagger.io:80/v2"
+)
+
 
 # Enter a context with an instance of the API client
 with petstore_api.ApiClient() as api_client:
@@ -135,6 +147,12 @@ import time
 import petstore_api
 from petstore_api.rest import ApiException
 from pprint import pprint
+# Defining the host is optional and defaults to http://petstore.swagger.io:80/v2
+# See configuration.py for a list of all supported configuration parameters.
+configuration = petstore_api.Configuration(
+    host = "http://petstore.swagger.io:80/v2"
+)
+
 
 # Enter a context with an instance of the API client
 with petstore_api.ApiClient() as api_client:
@@ -190,6 +208,12 @@ import time
 import petstore_api
 from petstore_api.rest import ApiException
 from pprint import pprint
+# Defining the host is optional and defaults to http://petstore.swagger.io:80/v2
+# See configuration.py for a list of all supported configuration parameters.
+configuration = petstore_api.Configuration(
+    host = "http://petstore.swagger.io:80/v2"
+)
+
 
 # Enter a context with an instance of the API client
 with petstore_api.ApiClient() as api_client:
@@ -244,6 +268,12 @@ import time
 import petstore_api
 from petstore_api.rest import ApiException
 from pprint import pprint
+# Defining the host is optional and defaults to http://petstore.swagger.io:80/v2
+# See configuration.py for a list of all supported configuration parameters.
+configuration = petstore_api.Configuration(
+    host = "http://petstore.swagger.io:80/v2"
+)
+
 
 # Enter a context with an instance of the API client
 with petstore_api.ApiClient() as api_client:
@@ -300,6 +330,12 @@ import time
 import petstore_api
 from petstore_api.rest import ApiException
 from pprint import pprint
+# Defining the host is optional and defaults to http://petstore.swagger.io:80/v2
+# See configuration.py for a list of all supported configuration parameters.
+configuration = petstore_api.Configuration(
+    host = "http://petstore.swagger.io:80/v2"
+)
+
 
 # Enter a context with an instance of the API client
 with petstore_api.ApiClient() as api_client:
@@ -357,6 +393,12 @@ import time
 import petstore_api
 from petstore_api.rest import ApiException
 from pprint import pprint
+# Defining the host is optional and defaults to http://petstore.swagger.io:80/v2
+# See configuration.py for a list of all supported configuration parameters.
+configuration = petstore_api.Configuration(
+    host = "http://petstore.swagger.io:80/v2"
+)
+
 
 # Enter a context with an instance of the API client
 with petstore_api.ApiClient() as api_client:
@@ -408,6 +450,12 @@ import time
 import petstore_api
 from petstore_api.rest import ApiException
 from pprint import pprint
+# Defining the host is optional and defaults to http://petstore.swagger.io:80/v2
+# See configuration.py for a list of all supported configuration parameters.
+configuration = petstore_api.Configuration(
+    host = "http://petstore.swagger.io:80/v2"
+)
+
 
 # Enter a context with an instance of the API client
 with petstore_api.ApiClient() as api_client:

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

@@ -27,7 +27,7 @@ from six.moves.urllib.parse import quote
 from petstore_api.configuration import Configuration
 import petstore_api.models
 from petstore_api import rest
-from petstore_api.exceptions import ApiValueError
+from petstore_api.exceptions import ApiValueError, ApiException
 
 
 class ApiClient(object):
@@ -176,22 +176,38 @@ class ApiClient(object):
             # use server/host defined in path or operation instead
             url = _host + resource_path
 
-        # perform request and return response
-        response_data = self.request(
-            method, url, query_params=query_params, headers=header_params,
-            post_params=post_params, body=body,
-            _preload_content=_preload_content,
-            _request_timeout=_request_timeout)
+        try:
+            # perform request and return response
+            response_data = self.request(
+                method, url, query_params=query_params, headers=header_params,
+                post_params=post_params, body=body,
+                _preload_content=_preload_content,
+                _request_timeout=_request_timeout)
+        except ApiException as e:
+            e.body = e.body.decode('utf-8') if six.PY3 else e.body
+            raise e
+
+        content_type = response_data.getheader('content-type')
 
         self.last_response = response_data
 
         return_data = response_data
-        if _preload_content:
-            # deserialize response data
-            if response_type:
-                return_data = self.deserialize(response_data, response_type)
-            else:
-                return_data = None
+
+        if not _preload_content:
+            return return_data
+
+        if six.PY3 and response_type not in ["file", "bytes"]:
+            match = None
+            if content_type is not None:
+                match = re.search(r"charset=([a-zA-Z\-\d]+)[\s\;]?", content_type)
+            encoding = match.group(1) if match else "utf-8"
+            response_data.data = response_data.data.decode(encoding)
+
+        # deserialize response data
+        if response_type:
+            return_data = self.deserialize(response_data, response_type)
+        else:
+            return_data = None
 
         if _return_http_data_only:
             return (return_data)
@@ -624,9 +640,12 @@ class ApiClient(object):
         :param klass: class literal.
         :return: model object.
         """
+        has_discriminator = False
+        if (hasattr(klass, 'get_real_child_model')
+                and klass.discriminator_value_class_map):
+            has_discriminator = True
 
-        if not klass.openapi_types and not hasattr(klass,
-                                                   'get_real_child_model'):
+        if not klass.openapi_types and has_discriminator is False:
             return data
 
         kwargs = {}
@@ -640,7 +659,7 @@ class ApiClient(object):
 
         instance = klass(**kwargs)
 
-        if hasattr(instance, 'get_real_child_model'):
+        if has_discriminator:
             klass_name = instance.get_real_child_model(data)
             if klass_name:
                 instance = self.__deserialize(data, klass_name)

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

@@ -62,10 +62,12 @@ class Configuration(object):
             name: JSESSIONID  # cookie name
 
     You can programmatically set the cookie:
-      conf = petstore_api.Configuration(
-        api_key={'cookieAuth': 'abc123'}
-        api_key_prefix={'cookieAuth': 'JSESSIONID'}
-      )
+
+conf = petstore_api.Configuration(
+    api_key={'cookieAuth': 'abc123'}
+    api_key_prefix={'cookieAuth': 'JSESSIONID'}
+)
+
     The following cookie will be added to the HTTP request:
        Cookie: JSESSIONID abc123
 
@@ -78,10 +80,12 @@ class Configuration(object):
             scheme: basic
 
     Configure API client with HTTP basic authentication:
-      conf = petstore_api.Configuration(
-          username='the-user',
-          password='the-password',
-      )
+
+conf = petstore_api.Configuration(
+    username='the-user',
+    password='the-password',
+)
+
     """
 
     _default = None
@@ -199,6 +203,9 @@ class Configuration(object):
         result.debug = self.debug
         return result
 
+    def __setattr__(self, name, value):
+        object.__setattr__(self, name, value)
+
     @classmethod
     def set_default(cls, default):
         """Set default instance of configuration.

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

@@ -217,11 +217,6 @@ class RESTClientObject(object):
         if _preload_content:
             r = RESTResponse(r)
 
-            # In the python 3, the response.data is bytes.
-            # we need to decode it to string.
-            if six.PY3:
-                r.data = r.data.decode('utf8')
-
             # log response body
             logger.debug("response body: %s", r.data)
 

samples/client/petstore/python/test/test_format_test.py

@@ -36,19 +36,19 @@ class TestFormatTest(unittest.TestCase):
         # model = petstore_api.models.format_test.FormatTest()  # noqa: E501
         if include_optional :
             return FormatTest(
-                integer = 1E+1, 
-                int32 = 2E+1, 
-                int64 = 56, 
-                number = 32.1, 
-                float = 54.3, 
-                double = 67.8, 
-                string = 'a', 
-                byte = 'YQ==', 
-                binary = bytes(b'blah'), 
-                date = datetime.datetime.strptime('1975-12-30', '%Y-%m-%d').date(), 
-                date_time = datetime.datetime.strptime('2013-10-20 19:20:30.00', '%Y-%m-%d %H:%M:%S.%f'), 
-                uuid = '72f98069-206d-4f12-9f12-3d1e525a8e84', 
-                password = '0123456789', 
+                integer = 1E+1,
+                int32 = 2E+1,
+                int64 = 56,
+                number = 32.1,
+                float = 54.3,
+                double = 67.8,
+                string = 'a',
+                byte = 'YQ==',
+                binary = 'bytes',
+                date = datetime.datetime.strptime('1975-12-30', '%Y-%m-%d').date(),
+                date_time = datetime.datetime.strptime('2013-10-20 19:20:30.00', '%Y-%m-%d %H:%M:%S.%f'),
+                uuid = '72f98069-206d-4f12-9f12-3d1e525a8e84',
+                password = '0123456789',
                 big_decimal = 1
             )
         else :

samples/client/petstore/python/tests/test_api_exception.py

@@ -10,6 +10,7 @@ $ nosetests -v
 """
 
 import os
+import six
 import sys
 import unittest