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

samples/openapi3/client/petstore/python-experimental/README.md

@@ -46,13 +46,19 @@ Please follow the [installation procedure](#installation--usage) and then run th
 
 ```python
 from __future__ import print_function
+import datetime
 import time
 import petstore_api
 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/openapi3/client/petstore/python-experimental/docs/AnotherFakeApi.md

@@ -21,6 +21,12 @@ from __future__ import print_function
 import time
 import petstore_api
 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/openapi3/client/petstore/python-experimental/docs/DefaultApi.md

@@ -19,6 +19,12 @@ from __future__ import print_function
 import time
 import petstore_api
 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/openapi3/client/petstore/python-experimental/docs/FakeApi.md

@@ -32,6 +32,12 @@ from __future__ import print_function
 import time
 import petstore_api
 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:
@@ -84,6 +90,12 @@ from __future__ import print_function
 import time
 import petstore_api
 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:
@@ -140,6 +152,12 @@ from __future__ import print_function
 import time
 import petstore_api
 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:
@@ -196,6 +214,12 @@ from __future__ import print_function
 import time
 import petstore_api
 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:
@@ -252,6 +276,12 @@ from __future__ import print_function
 import time
 import petstore_api
 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:
@@ -308,6 +338,12 @@ from __future__ import print_function
 import time
 import petstore_api
 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:
@@ -360,6 +396,12 @@ from __future__ import print_function
 import time
 import petstore_api
 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:
@@ -416,6 +458,12 @@ from __future__ import print_function
 import time
 import petstore_api
 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:
@@ -473,13 +521,22 @@ from __future__ import print_function
 import time
 import petstore_api
 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:
@@ -570,6 +627,12 @@ from __future__ import print_function
 import time
 import petstore_api
 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:
@@ -642,12 +705,21 @@ from __future__ import print_function
 import time
 import petstore_api
 from pprint import pprint
-configuration = petstore_api.Configuration()
-# Configure Bearer authorization (JWT): bearer_test
-configuration.access_token = 'YOUR_BEARER_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 Bearer authorization (JWT): bearer_test
+configuration = petstore_api.Configuration(
+    access_token = 'YOUR_BEARER_TOKEN'
+)
 
 # Enter a context with an instance of the API client
 with petstore_api.ApiClient(configuration) as api_client:
@@ -719,6 +791,12 @@ from __future__ import print_function
 import time
 import petstore_api
 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:
@@ -772,6 +850,12 @@ from __future__ import print_function
 import time
 import petstore_api
 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:
@@ -829,6 +913,12 @@ from __future__ import print_function
 import time
 import petstore_api
 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/openapi3/client/petstore/python-experimental/docs/FakeClassnameTags123Api.md

@@ -22,15 +22,27 @@ from __future__ import print_function
 import time
 import petstore_api
 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/openapi3/client/petstore/python-experimental/docs/PetApi.md

@@ -28,33 +28,82 @@ from __future__ import print_function
 import time
 import petstore_api
 from pprint import pprint
-configuration = petstore_api.Configuration()
-# Configure HTTP signature authorization: http_signature_test
-# You can specify the signing key-id, private key path, signing scheme, signing algorithm,
-# list of signed headers and signature max validity.
-configuration.signing_info = petstore_api.signing.HttpSigningConfiguration(
-    key_id =                 'my-key-id',
-    private_key_path =       'rsa.pem',
-    signing_scheme =         signing.SCHEME_HS2019,
-    signing_algorithm =      signing.ALGORITHM_RSASSA_PSS,
-    signed_headers =         [signing.HEADER_REQUEST_TARGET,
-                                signing.HEADER_CREATED,
-                                signing.HEADER_EXPIRES,
-                                signing.HEADER_HOST,
-                                signing.HEADER_DATE,
-                                signing.HEADER_DIGEST,
-                                'Content-Type',
-                                'Content-Length',
-                                'User-Agent'
-                                ],
-    signature_max_validity = datetime.timedelta(minutes=5)
+# 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"
 )
-configuration = petstore_api.Configuration()
-# Configure OAuth2 access token for authorization: petstore_auth
-configuration.access_token = 'YOUR_ACCESS_TOKEN'
 
-# 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 message signature: http_signature_test
+# The HTTP Signature Header mechanism that can be used by a client to
+# authenticate the sender of a message and ensure that particular headers
+# have not been modified in transit.
+#
+# You can specify the signing key-id, private key path, signing scheme,
+# signing algorithm, list of signed headers and signature max validity.
+# The 'key_id' parameter is an opaque string that the API server can use
+# to lookup the client and validate the signature.
+# The 'private_key_path' parameter should be the path to a file that
+# contains a DER or base-64 encoded private key.
+# The 'private_key_passphrase' parameter is optional. Set the passphrase
+# if the private key is encrypted.
+# The 'signed_headers' parameter is used to specify the list of
+# HTTP headers included when generating the signature for the message.
+# You can specify HTTP headers that you want to protect with a cryptographic
+# signature. Note that proxies may add, modify or remove HTTP headers
+# for legitimate reasons, so you should only add headers that you know
+# will not be modified. For example, if you want to protect the HTTP request
+# body, you can specify the Digest header. In that case, the client calculates
+# the digest of the HTTP request body and includes the digest in the message
+# signature.
+# The 'signature_max_validity' parameter is optional. It is configured as a
+# duration to express when the signature ceases to be valid. The client calculates
+# the expiration date every time it generates the cryptographic signature
+# of an HTTP request. The API server may have its own security policy
+# that controls the maximum validity of the signature. The client max validity
+# must be lower than the server max validity.
+# The time on the client and server must be synchronized, otherwise the
+# server may reject the client signature.
+#
+# The client must use a combination of private key, signing scheme,
+# signing algorithm and hash algorithm that matches the security policy of
+# the API server.
+#
+# See petstore_api.signing for a list of all supported parameters.
+configuration = petstore_api.Configuration(
+    host = "http://petstore.swagger.io:80/v2",
+    signing_info = petstore_api.signing.HttpSigningConfiguration(
+        key_id = 'my-key-id',
+        private_key_path = 'private_key.pem',
+        private_key_passphrase = 'YOUR_PASSPHRASE',
+        signing_scheme = petstore_api.signing.SCHEME_HS2019,
+        signing_algorithm = petstore_api.signing.ALGORITHM_ECDSA_MODE_FIPS_186_3,
+        hash_algorithm = petstore_api.signing.SCHEME_RSA_SHA256,
+        signed_headers = [
+                            petstore_api.signing.HEADER_REQUEST_TARGET,
+                            petstore_api.signing.HEADER_CREATED,
+                            petstore_api.signing.HEADER_EXPIRES,
+                            petstore_api.signing.HEADER_HOST,
+                            petstore_api.signing.HEADER_DATE,
+                            petstore_api.signing.HEADER_DIGEST,
+                            'Content-Type',
+                            'Content-Length',
+                            'User-Agent'
+                         ],
+        signature_max_validity = datetime.timedelta(minutes=5)
+    )
+)
+
+# 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:
@@ -109,12 +158,22 @@ from __future__ import print_function
 import time
 import petstore_api
 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:
@@ -181,33 +240,82 @@ from __future__ import print_function
 import time
 import petstore_api
 from pprint import pprint
-configuration = petstore_api.Configuration()
-# Configure HTTP signature authorization: http_signature_test
-# You can specify the signing key-id, private key path, signing scheme, signing algorithm,
-# list of signed headers and signature max validity.
-configuration.signing_info = petstore_api.signing.HttpSigningConfiguration(
-    key_id =                 'my-key-id',
-    private_key_path =       'rsa.pem',
-    signing_scheme =         signing.SCHEME_HS2019,
-    signing_algorithm =      signing.ALGORITHM_RSASSA_PSS,
-    signed_headers =         [signing.HEADER_REQUEST_TARGET,
-                                signing.HEADER_CREATED,
-                                signing.HEADER_EXPIRES,
-                                signing.HEADER_HOST,
-                                signing.HEADER_DATE,
-                                signing.HEADER_DIGEST,
-                                'Content-Type',
-                                'Content-Length',
-                                'User-Agent'
-                                ],
-    signature_max_validity = datetime.timedelta(minutes=5)
+# 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"
 )
-configuration = petstore_api.Configuration()
-# Configure OAuth2 access token for authorization: petstore_auth
-configuration.access_token = 'YOUR_ACCESS_TOKEN'
 
-# 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 message signature: http_signature_test
+# The HTTP Signature Header mechanism that can be used by a client to
+# authenticate the sender of a message and ensure that particular headers
+# have not been modified in transit.
+#
+# You can specify the signing key-id, private key path, signing scheme,
+# signing algorithm, list of signed headers and signature max validity.
+# The 'key_id' parameter is an opaque string that the API server can use
+# to lookup the client and validate the signature.
+# The 'private_key_path' parameter should be the path to a file that
+# contains a DER or base-64 encoded private key.
+# The 'private_key_passphrase' parameter is optional. Set the passphrase
+# if the private key is encrypted.
+# The 'signed_headers' parameter is used to specify the list of
+# HTTP headers included when generating the signature for the message.
+# You can specify HTTP headers that you want to protect with a cryptographic
+# signature. Note that proxies may add, modify or remove HTTP headers
+# for legitimate reasons, so you should only add headers that you know
+# will not be modified. For example, if you want to protect the HTTP request
+# body, you can specify the Digest header. In that case, the client calculates
+# the digest of the HTTP request body and includes the digest in the message
+# signature.
+# The 'signature_max_validity' parameter is optional. It is configured as a
+# duration to express when the signature ceases to be valid. The client calculates
+# the expiration date every time it generates the cryptographic signature
+# of an HTTP request. The API server may have its own security policy
+# that controls the maximum validity of the signature. The client max validity
+# must be lower than the server max validity.
+# The time on the client and server must be synchronized, otherwise the
+# server may reject the client signature.
+#
+# The client must use a combination of private key, signing scheme,
+# signing algorithm and hash algorithm that matches the security policy of
+# the API server.
+#
+# See petstore_api.signing for a list of all supported parameters.
+configuration = petstore_api.Configuration(
+    host = "http://petstore.swagger.io:80/v2",
+    signing_info = petstore_api.signing.HttpSigningConfiguration(
+        key_id = 'my-key-id',
+        private_key_path = 'private_key.pem',
+        private_key_passphrase = 'YOUR_PASSPHRASE',
+        signing_scheme = petstore_api.signing.SCHEME_HS2019,
+        signing_algorithm = petstore_api.signing.ALGORITHM_ECDSA_MODE_FIPS_186_3,
+        hash_algorithm = petstore_api.signing.SCHEME_RSA_SHA256,
+        signed_headers = [
+                            petstore_api.signing.HEADER_REQUEST_TARGET,
+                            petstore_api.signing.HEADER_CREATED,
+                            petstore_api.signing.HEADER_EXPIRES,
+                            petstore_api.signing.HEADER_HOST,
+                            petstore_api.signing.HEADER_DATE,
+                            petstore_api.signing.HEADER_DIGEST,
+                            'Content-Type',
+                            'Content-Length',
+                            'User-Agent'
+                         ],
+        signature_max_validity = datetime.timedelta(minutes=5)
+    )
+)
+
+# 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:
@@ -266,33 +374,82 @@ from __future__ import print_function
 import time
 import petstore_api
 from pprint import pprint
-configuration = petstore_api.Configuration()
-# Configure HTTP signature authorization: http_signature_test
-# You can specify the signing key-id, private key path, signing scheme, signing algorithm,
-# list of signed headers and signature max validity.
-configuration.signing_info = petstore_api.signing.HttpSigningConfiguration(
-    key_id =                 'my-key-id',
-    private_key_path =       'rsa.pem',
-    signing_scheme =         signing.SCHEME_HS2019,
-    signing_algorithm =      signing.ALGORITHM_RSASSA_PSS,
-    signed_headers =         [signing.HEADER_REQUEST_TARGET,
-                                signing.HEADER_CREATED,
-                                signing.HEADER_EXPIRES,
-                                signing.HEADER_HOST,
-                                signing.HEADER_DATE,
-                                signing.HEADER_DIGEST,
-                                'Content-Type',
-                                'Content-Length',
-                                'User-Agent'
-                                ],
-    signature_max_validity = datetime.timedelta(minutes=5)
+# 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"
 )
-configuration = petstore_api.Configuration()
-# Configure OAuth2 access token for authorization: petstore_auth
-configuration.access_token = 'YOUR_ACCESS_TOKEN'
 
-# 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 message signature: http_signature_test
+# The HTTP Signature Header mechanism that can be used by a client to
+# authenticate the sender of a message and ensure that particular headers
+# have not been modified in transit.
+#
+# You can specify the signing key-id, private key path, signing scheme,
+# signing algorithm, list of signed headers and signature max validity.
+# The 'key_id' parameter is an opaque string that the API server can use
+# to lookup the client and validate the signature.
+# The 'private_key_path' parameter should be the path to a file that
+# contains a DER or base-64 encoded private key.
+# The 'private_key_passphrase' parameter is optional. Set the passphrase
+# if the private key is encrypted.
+# The 'signed_headers' parameter is used to specify the list of
+# HTTP headers included when generating the signature for the message.
+# You can specify HTTP headers that you want to protect with a cryptographic
+# signature. Note that proxies may add, modify or remove HTTP headers
+# for legitimate reasons, so you should only add headers that you know
+# will not be modified. For example, if you want to protect the HTTP request
+# body, you can specify the Digest header. In that case, the client calculates
+# the digest of the HTTP request body and includes the digest in the message
+# signature.
+# The 'signature_max_validity' parameter is optional. It is configured as a
+# duration to express when the signature ceases to be valid. The client calculates
+# the expiration date every time it generates the cryptographic signature
+# of an HTTP request. The API server may have its own security policy
+# that controls the maximum validity of the signature. The client max validity
+# must be lower than the server max validity.
+# The time on the client and server must be synchronized, otherwise the
+# server may reject the client signature.
+#
+# The client must use a combination of private key, signing scheme,
+# signing algorithm and hash algorithm that matches the security policy of
+# the API server.
+#
+# See petstore_api.signing for a list of all supported parameters.
+configuration = petstore_api.Configuration(
+    host = "http://petstore.swagger.io:80/v2",
+    signing_info = petstore_api.signing.HttpSigningConfiguration(
+        key_id = 'my-key-id',
+        private_key_path = 'private_key.pem',
+        private_key_passphrase = 'YOUR_PASSPHRASE',
+        signing_scheme = petstore_api.signing.SCHEME_HS2019,
+        signing_algorithm = petstore_api.signing.ALGORITHM_ECDSA_MODE_FIPS_186_3,
+        hash_algorithm = petstore_api.signing.SCHEME_RSA_SHA256,
+        signed_headers = [
+                            petstore_api.signing.HEADER_REQUEST_TARGET,
+                            petstore_api.signing.HEADER_CREATED,
+                            petstore_api.signing.HEADER_EXPIRES,
+                            petstore_api.signing.HEADER_HOST,
+                            petstore_api.signing.HEADER_DATE,
+                            petstore_api.signing.HEADER_DIGEST,
+                            'Content-Type',
+                            'Content-Length',
+                            'User-Agent'
+                         ],
+        signature_max_validity = datetime.timedelta(minutes=5)
+    )
+)
+
+# 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:
@@ -351,15 +508,27 @@ from __future__ import print_function
 import time
 import petstore_api
 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
@@ -416,33 +585,82 @@ from __future__ import print_function
 import time
 import petstore_api
 from pprint import pprint
-configuration = petstore_api.Configuration()
-# Configure HTTP signature authorization: http_signature_test
-# You can specify the signing key-id, private key path, signing scheme, signing algorithm,
-# list of signed headers and signature max validity.
-configuration.signing_info = petstore_api.signing.HttpSigningConfiguration(
-    key_id =                 'my-key-id',
-    private_key_path =       'rsa.pem',
-    signing_scheme =         signing.SCHEME_HS2019,
-    signing_algorithm =      signing.ALGORITHM_RSASSA_PSS,
-    signed_headers =         [signing.HEADER_REQUEST_TARGET,
-                                signing.HEADER_CREATED,
-                                signing.HEADER_EXPIRES,
-                                signing.HEADER_HOST,
-                                signing.HEADER_DATE,
-                                signing.HEADER_DIGEST,
-                                'Content-Type',
-                                'Content-Length',
-                                'User-Agent'
-                                ],
-    signature_max_validity = datetime.timedelta(minutes=5)
+# 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"
 )
-configuration = petstore_api.Configuration()
-# Configure OAuth2 access token for authorization: petstore_auth
-configuration.access_token = 'YOUR_ACCESS_TOKEN'
 
-# 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 message signature: http_signature_test
+# The HTTP Signature Header mechanism that can be used by a client to
+# authenticate the sender of a message and ensure that particular headers
+# have not been modified in transit.
+#
+# You can specify the signing key-id, private key path, signing scheme,
+# signing algorithm, list of signed headers and signature max validity.
+# The 'key_id' parameter is an opaque string that the API server can use
+# to lookup the client and validate the signature.
+# The 'private_key_path' parameter should be the path to a file that
+# contains a DER or base-64 encoded private key.
+# The 'private_key_passphrase' parameter is optional. Set the passphrase
+# if the private key is encrypted.
+# The 'signed_headers' parameter is used to specify the list of
+# HTTP headers included when generating the signature for the message.
+# You can specify HTTP headers that you want to protect with a cryptographic
+# signature. Note that proxies may add, modify or remove HTTP headers
+# for legitimate reasons, so you should only add headers that you know
+# will not be modified. For example, if you want to protect the HTTP request
+# body, you can specify the Digest header. In that case, the client calculates
+# the digest of the HTTP request body and includes the digest in the message
+# signature.
+# The 'signature_max_validity' parameter is optional. It is configured as a
+# duration to express when the signature ceases to be valid. The client calculates
+# the expiration date every time it generates the cryptographic signature
+# of an HTTP request. The API server may have its own security policy
+# that controls the maximum validity of the signature. The client max validity
+# must be lower than the server max validity.
+# The time on the client and server must be synchronized, otherwise the
+# server may reject the client signature.
+#
+# The client must use a combination of private key, signing scheme,
+# signing algorithm and hash algorithm that matches the security policy of
+# the API server.
+#
+# See petstore_api.signing for a list of all supported parameters.
+configuration = petstore_api.Configuration(
+    host = "http://petstore.swagger.io:80/v2",
+    signing_info = petstore_api.signing.HttpSigningConfiguration(
+        key_id = 'my-key-id',
+        private_key_path = 'private_key.pem',
+        private_key_passphrase = 'YOUR_PASSPHRASE',
+        signing_scheme = petstore_api.signing.SCHEME_HS2019,
+        signing_algorithm = petstore_api.signing.ALGORITHM_ECDSA_MODE_FIPS_186_3,
+        hash_algorithm = petstore_api.signing.SCHEME_RSA_SHA256,
+        signed_headers = [
+                            petstore_api.signing.HEADER_REQUEST_TARGET,
+                            petstore_api.signing.HEADER_CREATED,
+                            petstore_api.signing.HEADER_EXPIRES,
+                            petstore_api.signing.HEADER_HOST,
+                            petstore_api.signing.HEADER_DATE,
+                            petstore_api.signing.HEADER_DIGEST,
+                            'Content-Type',
+                            'Content-Length',
+                            'User-Agent'
+                         ],
+        signature_max_validity = datetime.timedelta(minutes=5)
+    )
+)
+
+# 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:
@@ -499,12 +717,22 @@ from __future__ import print_function
 import time
 import petstore_api
 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:
@@ -571,12 +799,22 @@ from __future__ import print_function
 import time
 import petstore_api
 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:
@@ -645,12 +883,22 @@ from __future__ import print_function
 import time
 import petstore_api
 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/openapi3/client/petstore/python-experimental/docs/StoreApi.md

@@ -24,6 +24,12 @@ from __future__ import print_function
 import time
 import petstore_api
 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:
@@ -81,15 +87,27 @@ from __future__ import print_function
 import time
 import petstore_api
 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
@@ -141,6 +159,12 @@ from __future__ import print_function
 import time
 import petstore_api
 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:
@@ -197,6 +221,12 @@ from __future__ import print_function
 import time
 import petstore_api
 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/openapi3/client/petstore/python-experimental/docs/UserApi.md

@@ -28,6 +28,12 @@ from __future__ import print_function
 import time
 import petstore_api
 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:
@@ -81,6 +87,12 @@ from __future__ import print_function
 import time
 import petstore_api
 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:
@@ -134,6 +146,12 @@ from __future__ import print_function
 import time
 import petstore_api
 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:
@@ -189,6 +207,12 @@ from __future__ import print_function
 import time
 import petstore_api
 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:
@@ -243,6 +267,12 @@ from __future__ import print_function
 import time
 import petstore_api
 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:
@@ -299,6 +329,12 @@ from __future__ import print_function
 import time
 import petstore_api
 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:
@@ -356,6 +392,12 @@ from __future__ import print_function
 import time
 import petstore_api
 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:
@@ -407,6 +449,12 @@ from __future__ import print_function
 import time
 import petstore_api
 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/openapi3/client/petstore/python-experimental/petstore_api/api_client.py

@@ -15,6 +15,7 @@ import atexit
 import mimetypes
 from multiprocessing.pool import ThreadPool
 import os
+import re
 
 # python 2 and python 3 compatibility library
 import six
@@ -22,7 +23,7 @@ from six.moves.urllib.parse import quote
 
 from petstore_api import rest
 from petstore_api.configuration import Configuration
-from petstore_api.exceptions import ApiValueError
+from petstore_api.exceptions import ApiValueError, ApiException
 from petstore_api.model_utils import (
     ModelNormal,
     ModelSimple,
@@ -178,26 +179,43 @@ 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,
-                    _check_type
-                )
-            else:
-                return_data = None
+
+        if not _preload_content:
+            return (return_data)
+            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,
+                _check_type
+            )
+        else:
+            return_data = None
 
         if _return_http_data_only:
             return (return_data)

samples/openapi3/client/petstore/python-experimental/petstore_api/configuration.py

@@ -64,10 +64,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
 
@@ -80,10 +82,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',
+)
+
 
     HTTP Signature Authentication Example.
     Given the following security scheme in the OpenAPI specification:
@@ -105,24 +109,24 @@ class Configuration(object):
     load balancers may add/modify/remove headers. Include the HTTP headers that you know
     are not going to be modified in transit.
 
-      conf = petstore_api.Configuration(
-        signing_info = petstore_api.signing.HttpSigningConfiguration(
-            key_id =                 'my-key-id',
-            private_key_path =       'rsa.pem',
-            signing_scheme =         signing.SCHEME_HS2019,
-            signing_algorithm =      signing.ALGORITHM_RSASSA_PSS,
-            signed_headers =         [signing.HEADER_REQUEST_TARGET,
-                                      signing.HEADER_CREATED,
-                                      signing.HEADER_EXPIRES,
-                                      signing.HEADER_HOST,
-                                      signing.HEADER_DATE,
-                                      signing.HEADER_DIGEST,
-                                      'Content-Type',
-                                      'User-Agent'
-                                     ],
-            signature_max_validity = datetime.timedelta(minutes=5)
-        )
-      )
+conf = petstore_api.Configuration(
+    signing_info = petstore_api.signing.HttpSigningConfiguration(
+        key_id =                 'my-key-id',
+        private_key_path =       'rsa.pem',
+        signing_scheme =         petstore_api.signing.SCHEME_HS2019,
+        signing_algorithm =      petstore_api.signing.ALGORITHM_RSASSA_PSS,
+        signed_headers =         [petstore_api.signing.HEADER_REQUEST_TARGET,
+                                    petstore_api.signing.HEADER_CREATED,
+                                    petstore_api.signing.HEADER_EXPIRES,
+                                    petstore_api.signing.HEADER_HOST,
+                                    petstore_api.signing.HEADER_DATE,
+                                    petstore_api.signing.HEADER_DIGEST,
+                                    'Content-Type',
+                                    'User-Agent'
+                                    ],
+        signature_max_validity = datetime.timedelta(minutes=5)
+    )
+)
     """
 
     _default = None
@@ -246,6 +250,13 @@ class Configuration(object):
         result.debug = self.debug
         return result
 
+    def __setattr__(self, name, value):
+        object.__setattr__(self, name, value)
+        if name == "signing_info" and value is not None:
+            # Ensure the host paramater from signing info is the same as
+            # Configuration.host.
+            value.host = self.host
+
     @classmethod
     def set_default(cls, default):
         """Set default instance of configuration.

samples/openapi3/client/petstore/python-experimental/petstore_api/model_utils.py

@@ -336,7 +336,7 @@ COERCION_INDEX_BY_TYPE = {
     ModelComposed: 0,
     ModelNormal: 1,
     ModelSimple: 2,
-    none_type: 3,
+    none_type: 3,    # The type of 'None'.
     list: 4,
     dict: 5,
     float: 6,
@@ -345,7 +345,7 @@ COERCION_INDEX_BY_TYPE = {
     datetime: 9,
     date: 10,
     str: 11,
-    file_type: 12,
+    file_type: 12,   # 'file_type' is an alias for the built-in 'file' or 'io.IOBase' type.
 }
 
 # these are used to limit what type conversions we try to do
@@ -614,11 +614,11 @@ def order_response_types(required_types):
 
     Args:
         required_types (list/tuple): collection of classes or instance of
-            list or dict with classs information inside it
+            list or dict with class information inside it.
 
     Returns:
         (list): coercion order sorted collection of classes or instance
-            of list or dict with classs information inside it
+            of list or dict with class information inside it.
     """
 
     def index_getter(class_or_instance):
@@ -635,7 +635,9 @@ def order_response_types(required_types):
         elif (inspect.isclass(class_or_instance)
                 and issubclass(class_or_instance, ModelSimple)):
             return COERCION_INDEX_BY_TYPE[ModelSimple]
-        return COERCION_INDEX_BY_TYPE[class_or_instance]
+        elif class_or_instance in COERCION_INDEX_BY_TYPE:
+            return COERCION_INDEX_BY_TYPE[class_or_instance]
+        raise ApiValueError("Unsupported type: %s" % class_or_instance)
 
     sorted_types = sorted(
         required_types,
@@ -653,7 +655,7 @@ def remove_uncoercible(required_types_classes, current_item, from_server,
                           these should be ordered by COERCION_INDEX_BY_TYPE
         from_server (bool): a boolean of whether the data is from the server
                           if false, the data is from the client
-        current_item (any): the current item to be converted
+        current_item (any): the current item (input data) to be converted
 
     Keyword Args:
         must_convert (bool): if True the item to convert is of the wrong

samples/openapi3/client/petstore/python-experimental/petstore_api/models/animal.py

@@ -90,12 +90,13 @@ class Animal(ModelNormal):
 
     @staticmethod
     def discriminator():
-        return {
-            'class_name': {
-                'Cat': cat.Cat,
-                'Dog': dog.Dog,
-            },
+        val = {
+            'Cat': cat.Cat,
+            'Dog': dog.Dog,
         }
+        if not val:
+            return None
+        return {'class_name': val}
 
     attribute_map = {
         'class_name': 'className',  # noqa: E501

samples/openapi3/client/petstore/python-experimental/petstore_api/models/cat.py

@@ -96,7 +96,11 @@ class Cat(ModelComposed):
 
     @staticmethod
     def discriminator():
-        return None
+        val = {
+        }
+        if not val:
+            return None
+        return {'class_name': val}
 
     attribute_map = {
         'class_name': 'className',  # noqa: E501
@@ -200,3 +204,16 @@ class Cat(ModelComposed):
           'oneOf': [
           ],
         }
+
+    @classmethod
+    def get_discriminator_class(cls, from_server, data):
+        """Returns the child class specified by the discriminator"""
+        discriminator = cls.discriminator()
+        discr_propertyname_py = list(discriminator.keys())[0]
+        discr_propertyname_js = cls.attribute_map[discr_propertyname_py]
+        if from_server:
+            class_name = data[discr_propertyname_js]
+        else:
+            class_name = data[discr_propertyname_py]
+        class_name_to_discr_class = discriminator[discr_propertyname_py]
+        return class_name_to_discr_class.get(class_name)

samples/openapi3/client/petstore/python-experimental/petstore_api/models/dog.py

@@ -91,7 +91,11 @@ class Dog(ModelComposed):
 
     @staticmethod
     def discriminator():
-        return None
+        val = {
+        }
+        if not val:
+            return None
+        return {'class_name': val}
 
     attribute_map = {
         'class_name': 'className',  # noqa: E501
@@ -194,3 +198,16 @@ class Dog(ModelComposed):
           'oneOf': [
           ],
         }
+
+    @classmethod
+    def get_discriminator_class(cls, from_server, data):
+        """Returns the child class specified by the discriminator"""
+        discriminator = cls.discriminator()
+        discr_propertyname_py = list(discriminator.keys())[0]
+        discr_propertyname_js = cls.attribute_map[discr_propertyname_py]
+        if from_server:
+            class_name = data[discr_propertyname_js]
+        else:
+            class_name = data[discr_propertyname_py]
+        class_name_to_discr_class = discriminator[discr_propertyname_py]
+        return class_name_to_discr_class.get(class_name)

samples/openapi3/client/petstore/python-experimental/petstore_api/models/mammal.py

@@ -97,12 +97,13 @@ class Mammal(ModelComposed):
 
     @staticmethod
     def discriminator():
-        return {
-            'class_name': {
-                'whale': whale.Whale,
-                'zebra': zebra.Zebra,
-            },
+        val = {
+            'whale': whale.Whale,
+            'zebra': zebra.Zebra,
         }
+        if not val:
+            return None
+        return {'class_name': val}
 
     attribute_map = {
         'class_name': 'className',  # noqa: E501

samples/openapi3/client/petstore/python-experimental/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)