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

[Python] Add Support for Content-Disposition Header without filename (#11055)

Browse Source 
* [Python] Add Support for CD header w/o filename

* updated documentation per PR instructions

* fixed formatting and updated samples and docs

* revert docs changes

* regenerate python samples

* updated sample python test
This commit is contained in:
Cameron Koegel
2022-03-08 12:10:49 -05:00
committed by GitHub
parent b1c6513015
commit 94b1440074
7 changed files with 83 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
samples/openapi3/client/petstore/python/petstore_api/model_utils.py
View File

@@ -16,6 +16,7 @@ import os
import pprint
import re
import tempfile
import uuid
from dateutil.parser import parse
@@ -1399,7 +1400,13 @@ def deserialize_file(response_data, configuration, content_disposition=None):
if content_disposition:
filename = re.search(r'filename=[\'"]?([^\'"\s]+)[\'"]?',
content_disposition).group(1)
content_disposition,
flags=re.I)
if filename is not None:
filename = filename.group(1)
else:
filename = "default_" + str(uuid.uuid4())
path = os.path.join(os.path.dirname(path), filename)
with open(path, "wb") as f:

66
samples/openapi3/client/petstore/python/tests_manual/test_fake_api.py
View File

@@ -495,42 +495,46 @@ class TestFakeApi(unittest.TestCase):
# sample from http://www.jtricks.com/download-text
file_name = 'content.txt'
headers = {'Content-Disposition': 'attachment; filename={}'.format(file_name), 'Content-Type': 'text/plain'}
def get_headers():
return headers
def get_header(name, default=None):
return headers.get(name, default)
headers_dict = {
'with_filename': {'Content-Disposition': 'attachment; filename={}'.format(file_name), 'Content-Type': 'text/plain'},
'no_filename': {'Content-Disposition': 'attachment;', 'Content-Type': 'text/plain'}
}
def get_headers(*args):
return args
file_data = (
"You are reading text file that was supposed to be downloaded\r\n"
"to your hard disk. If your browser offered to save you the file,"
"\r\nthen it handled the Content-Disposition header correctly."
)
http_response = HTTPResponse(
status=200,
reason='OK',
data=file_data,
getheaders=get_headers,
getheader=get_header
)
# deserialize response to a file
mock_response = RESTResponse(http_response)
with patch.object(RESTClientObject, 'request') as mock_method:
mock_method.return_value = mock_response
try:
file_object = self.api.download_attachment(file_name='download-text')
self.assert_request_called_with(
mock_method,
'http://www.jtricks.com/download-text',
http_method='GET',
accept='text/plain',
content_type=None,
)
self.assertTrue(isinstance(file_object, file_type))
self.assertFalse(file_object.closed)
self.assertEqual(file_object.read(), file_data.encode('utf-8'))
finally:
file_object.close()
os.unlink(file_object.name)
for key, headers in headers_dict.items():
def get_header(name, default=None):
return headers_dict[key].get(name, default)
http_response = HTTPResponse(
status=200,
reason='OK',
data=file_data,
getheaders=get_headers(headers),
getheader=get_header
)
# deserialize response to a file
mock_response = RESTResponse(http_response)
with patch.object(RESTClientObject, 'request') as mock_method:
mock_method.return_value = mock_response
try:
file_object = self.api.download_attachment(file_name='download-text')
self.assert_request_called_with(
mock_method,
'http://www.jtricks.com/download-text',
http_method='GET',
accept='text/plain',
content_type=None,
)
self.assertTrue(isinstance(file_object, file_type))
self.assertFalse(file_object.closed)
self.assertEqual(file_object.read(), file_data.encode('utf-8'))
finally:
file_object.close()
os.unlink(file_object.name)
def test_upload_download_file(self):
test_file_dir = os.path.realpath(