From c6be3cbdd792c7ec32f11bfe6b22fa9f4e38f614 Mon Sep 17 00:00:00 2001 From: Achilles Rasquinha Date: Fri, 23 Mar 2018 15:34:46 +0530 Subject: [PATCH] fix test case --- frappe/core/doctype/data_export/exporter.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/frappe/core/doctype/data_export/exporter.py b/frappe/core/doctype/data_export/exporter.py index 98b657d71c..0ea61f2554 100644 --- a/frappe/core/doctype/data_export/exporter.py +++ b/frappe/core/doctype/data_export/exporter.py @@ -29,7 +29,7 @@ def export_data(doctype=None, parent_doctype=None, all_doctypes=True, with_data= select_columns=select_columns, file_type=file_type, template=template, filters=filters) exporter.build_response() -class DataExporter(): +class DataExporter: def __init__(self, doctype=None, parent_doctype=None, all_doctypes=True, with_data=False, select_columns=None, file_type='CSV', template=False, filters=None): self.doctype = doctype @@ -98,10 +98,9 @@ class DataExporter(): self.add_data() if self.with_data and not self.data: frappe.respond_as_web_page(_('No Data'), _('There is no data to be exported'), indicator_color='orange') - return if self.file_type == 'Excel': - return self.build_response_as_excel() + self.build_response_as_excel() else: # write out response as a type csv frappe.response['result'] = cstr(self.writer.getvalue()) @@ -323,7 +322,7 @@ class DataExporter(): def build_response_as_excel(self): filename = frappe.generate_hash("", 10) with open(filename, 'wb') as f: - f.write(cstr(self.writer.getvalue()).encode("utf-8")) + f.write(cstr(self.writer.getvalue())) f = open(filename) reader = csv.reader(f)