From 0563788cb275ae4a7a0595693999bccd5d309195 Mon Sep 17 00:00:00 2001 From: Achilles Rasquinha Date: Sat, 31 Mar 2018 17:47:16 +0530 Subject: [PATCH 1/2] fix data import test case --- frappe/utils/csvutils.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frappe/utils/csvutils.py b/frappe/utils/csvutils.py index 68eb47830e..54c27a27a8 100644 --- a/frappe/utils/csvutils.py +++ b/frappe/utils/csvutils.py @@ -105,7 +105,8 @@ class UnicodeWriter: self.writer = csv.writer(self.queue, quoting=csv.QUOTE_NONNUMERIC) def writerow(self, row): - row = encode(row, self.encoding) + if six.PY2: + row = encode(row, self.encoding) self.writer.writerow(row) def getvalue(self): From 3a5c090bde7a1a3fc340dbb69d658f431dffa55c Mon Sep 17 00:00:00 2001 From: Achilles Rasquinha Date: Sat, 31 Mar 2018 18:01:11 +0530 Subject: [PATCH 2/2] fix test case --- frappe/utils/csvutils.py | 1 + 1 file changed, 1 insertion(+) diff --git a/frappe/utils/csvutils.py b/frappe/utils/csvutils.py index 54c27a27a8..2106afea4e 100644 --- a/frappe/utils/csvutils.py +++ b/frappe/utils/csvutils.py @@ -6,6 +6,7 @@ import frappe from frappe import msgprint, _ import json import csv +import six from six import StringIO, text_type, string_types from frappe.utils import encode, cstr, cint, flt, comma_or