From 032b77ac23f2b92283e72cc7efcf787d22565abc Mon Sep 17 00:00:00 2001 From: John Dennis Date: Wed, 15 Jun 2011 13:06:14 -0400 Subject: Add backslash escape support for cvs reader --- ipalib/parameters.py | 3 ++- ipaserver/install/ldapupdate.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ipalib/parameters.py b/ipalib/parameters.py index 1551df3f..ee660848 100644 --- a/ipalib/parameters.py +++ b/ipalib/parameters.py @@ -1404,7 +1404,8 @@ class List(Param): def __unicode_csv_reader(self, unicode_csv_data, dialect=csv.excel, **kwargs): # csv.py doesn't do Unicode; encode temporarily as UTF-8: csv_reader = csv.reader(self.__utf_8_encoder(unicode_csv_data), - dialect=dialect, delimiter=self.separator, + dialect=dialect, + delimiter=self.separator, escapechar='\\', skipinitialspace=self.skipspace, **kwargs) for row in csv_reader: diff --git a/ipaserver/install/ldapupdate.py b/ipaserver/install/ldapupdate.py index 9d36ddd1..2d9c473d 100644 --- a/ipaserver/install/ldapupdate.py +++ b/ipaserver/install/ldapupdate.py @@ -141,7 +141,8 @@ class LDAPUpdate: def __unicode_csv_reader(self, unicode_csv_data, quote_char="'", dialect=csv.excel, **kwargs): # csv.py doesn't do Unicode; encode temporarily as UTF-8: csv_reader = csv.reader(self.__utf_8_encoder(unicode_csv_data), - dialect=dialect, delimiter=',', + dialect=dialect, + delimiter=',', escapechar='\\', quotechar=quote_char, skipinitialspace=True, **kwargs) -- cgit