From 33f8ba99f833fff98ab81fe08c4cf08173d7b5ad Mon Sep 17 00:00:00 2001 From: "Norbert @ infoCatch" Date: Tue, 23 May 2017 23:07:20 +0200 Subject: [PATCH 1/2] Preserve newlines Preserve newlines in multiline textfield import Remove unnecessary splitlines for header --- src/collective/importexport/browser/import_view.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/collective/importexport/browser/import_view.py b/src/collective/importexport/browser/import_view.py index 40bd429..5e27549 100644 --- a/src/collective/importexport/browser/import_view.py +++ b/src/collective/importexport/browser/import_view.py @@ -84,7 +84,7 @@ def read_and_create(container, data, mappings, object_type, create_new=False, # TODO(ivanteoh): Make sure container is either folder or SiteRoot - reader = csv.DictReader(data.splitlines(), + reader = csv.DictReader(data.splitlines(True), delimiter=",", dialect="excel", quotechar='"') @@ -459,7 +459,7 @@ def headersFromRequest(self): header_list = settings.get('header_list',[]) matching_fields = settings.get('matching_fields',{}) if request.get('csv_header'): - reader = csv.DictReader(request.get('csv_header').splitlines(), + reader = csv.DictReader(request.get('csv_header'), delimiter=",", dialect="excel", quotechar='"') From 91e24d497dd6118e4540b5ff3a98c297b626850b Mon Sep 17 00:00:00 2001 From: "Norbert @ infoCatch" Date: Wed, 24 May 2017 16:44:59 +0200 Subject: [PATCH 2/2] Revert previous commit --- src/collective/importexport/browser/import_view.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/collective/importexport/browser/import_view.py b/src/collective/importexport/browser/import_view.py index 5e27549..dc79a99 100644 --- a/src/collective/importexport/browser/import_view.py +++ b/src/collective/importexport/browser/import_view.py @@ -459,7 +459,7 @@ def headersFromRequest(self): header_list = settings.get('header_list',[]) matching_fields = settings.get('matching_fields',{}) if request.get('csv_header'): - reader = csv.DictReader(request.get('csv_header'), + reader = csv.DictReader(request.get('csv_header').splitlines(), delimiter=",", dialect="excel", quotechar='"')