More tweaks for python 3
This commit is contained in:
parent
135e98cde1
commit
5c1008a0df
7 changed files with 33 additions and 19 deletions
|
@ -2010,12 +2010,17 @@ class MasterView(View):
|
|||
for row in self.get_effective_row_data(sort=True):
|
||||
writer.writerow(self.get_row_csv_row(row, fields))
|
||||
response = self.request.response
|
||||
response.body = data.getvalue()
|
||||
filename = self.get_row_results_csv_filename(obj)
|
||||
if six.PY3:
|
||||
response.text = data.getvalue()
|
||||
response.content_type = 'text/csv'
|
||||
response.content_disposition = 'attachment; filename={}'.format(filename)
|
||||
else:
|
||||
response.body = data.getvalue()
|
||||
response.content_type = b'text/csv'
|
||||
response.content_disposition = b'attachment; filename={}'.format(filename)
|
||||
data.close()
|
||||
response.content_length = len(response.body)
|
||||
response.content_type = b'text/csv'
|
||||
filename = self.get_row_results_csv_filename(obj)
|
||||
response.content_disposition = b'attachment; filename={}'.format(filename)
|
||||
return response
|
||||
|
||||
def get_row_results_csv_filename(self, instance):
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue