loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

[python] check output content-type only if preload_content is set (#7847)

Browse Source
This commit is contained in:
Tomasz Prus 2020-11-04 17:41:00 +01:00 committed by GitHub
parent 739249917c
commit b3bc926b1d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/openapi-generator/src/main/resources/python/api_client.mustache vendored
View File

@ -200,8 +200,6 @@ class ApiClient(object):
e.body = e.body.decode('utf-8') if six.PY3 else e.body e.body = e.body.decode('utf-8') if six.PY3 else e.body
raise e raise e
content_type = response_data.getheader('content-type')
self.last_response = response_data self.last_response = response_data
return_data = response_data return_data = response_data
@ -218,6 +216,7 @@ class ApiClient(object):
if six.PY3 and response_type not in ["file", "bytes"]: if six.PY3 and response_type not in ["file", "bytes"]:
match = None match = None
content_type = response_data.getheader('content-type')
if content_type is not None: if content_type is not None:
match = re.search(r"charset=([a-zA-Z\-\d]+)[\s\;]?", content_type) match = re.search(r"charset=([a-zA-Z\-\d]+)[\s\;]?", content_type)
encoding = match.group(1) if match else "utf-8" encoding = match.group(1) if match else "utf-8"

3
samples/client/petstore/python-asyncio/petstore_api/api_client.py
View File

@ -191,8 +191,6 @@ class ApiClient(object):
e.body = e.body.decode('utf-8') if six.PY3 else e.body e.body = e.body.decode('utf-8') if six.PY3 else e.body
raise e raise e
content_type = response_data.getheader('content-type')
self.last_response = response_data self.last_response = response_data
return_data = response_data return_data = response_data
@ -204,6 +202,7 @@ class ApiClient(object):
if six.PY3 and response_type not in ["file", "bytes"]: if six.PY3 and response_type not in ["file", "bytes"]:
match = None match = None
content_type = response_data.getheader('content-type')
if content_type is not None: if content_type is not None:
match = re.search(r"charset=([a-zA-Z\-\d]+)[\s\;]?", content_type) match = re.search(r"charset=([a-zA-Z\-\d]+)[\s\;]?", content_type)
encoding = match.group(1) if match else "utf-8" encoding = match.group(1) if match else "utf-8"

3
samples/client/petstore/python-tornado/petstore_api/api_client.py
View File

@ -192,8 +192,6 @@ class ApiClient(object):
e.body = e.body.decode('utf-8') if six.PY3 else e.body e.body = e.body.decode('utf-8') if six.PY3 else e.body
raise e raise e
content_type = response_data.getheader('content-type')
self.last_response = response_data self.last_response = response_data
return_data = response_data return_data = response_data
@ -205,6 +203,7 @@ class ApiClient(object):
if six.PY3 and response_type not in ["file", "bytes"]: if six.PY3 and response_type not in ["file", "bytes"]:
match = None match = None
content_type = response_data.getheader('content-type')
if content_type is not None: if content_type is not None:
match = re.search(r"charset=([a-zA-Z\-\d]+)[\s\;]?", content_type) match = re.search(r"charset=([a-zA-Z\-\d]+)[\s\;]?", content_type)
encoding = match.group(1) if match else "utf-8" encoding = match.group(1) if match else "utf-8"

3
samples/client/petstore/python/petstore_api/api_client.py
View File

@ -190,8 +190,6 @@ class ApiClient(object):
e.body = e.body.decode('utf-8') if six.PY3 else e.body e.body = e.body.decode('utf-8') if six.PY3 else e.body
raise e raise e
content_type = response_data.getheader('content-type')
self.last_response = response_data self.last_response = response_data
return_data = response_data return_data = response_data
@ -203,6 +201,7 @@ class ApiClient(object):
if six.PY3 and response_type not in ["file", "bytes"]: if six.PY3 and response_type not in ["file", "bytes"]:
match = None match = None
content_type = response_data.getheader('content-type')
if content_type is not None: if content_type is not None:
match = re.search(r"charset=([a-zA-Z\-\d]+)[\s\;]?", content_type) match = re.search(r"charset=([a-zA-Z\-\d]+)[\s\;]?", content_type)
encoding = match.group(1) if match else "utf-8" encoding = match.group(1) if match else "utf-8"

3
samples/openapi3/client/petstore/python/petstore_api/api_client.py
View File

@ -190,8 +190,6 @@ class ApiClient(object):
e.body = e.body.decode('utf-8') if six.PY3 else e.body e.body = e.body.decode('utf-8') if six.PY3 else e.body
raise e raise e
content_type = response_data.getheader('content-type')
self.last_response = response_data self.last_response = response_data
return_data = response_data return_data = response_data
@ -203,6 +201,7 @@ class ApiClient(object):
if six.PY3 and response_type not in ["file", "bytes"]: if six.PY3 and response_type not in ["file", "bytes"]:
match = None match = None
content_type = response_data.getheader('content-type')
if content_type is not None: if content_type is not None:
match = re.search(r"charset=([a-zA-Z\-\d]+)[\s\;]?", content_type) match = re.search(r"charset=([a-zA-Z\-\d]+)[\s\;]?", content_type)
encoding = match.group(1) if match else "utf-8" encoding = match.group(1) if match else "utf-8"