Skip to content

add helper function for unicode delimiter and quotechar #60

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
artwr wants to merge 1 commit into
base: master
Choose a base branch
from
Open

add helper function for unicode delimiter and quotechar #60

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion unicodecsv/py2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,13 @@ def _stringify_list(l, encoding, errors='strict'):
raise csv.Error(str(e))


def _encode_kwds(kwds, encoding, errors='strict'):
for k, v in kwds.items():
if k in ('delimiter', 'quotechar') and isinstance(v, unicode):
kwds[k] = v.encode(encoding, errors)
return kwds


def _unicodify(s, encoding):
if s is None:
return None
Expand Down Expand Up @@ -79,8 +86,9 @@ class UnicodeWriter(object):
def __init__(self, f, dialect=csv.excel, encoding='utf-8', errors='strict',
*args, **kwds):
self.encoding = encoding
self.writer = csv.writer(f, dialect, *args, **kwds)
self.encoding_errors = errors
kwds = _encode_kwds(kwds, encoding, errors)
self.writer = csv.writer(f, dialect, *args, **kwds)

def writerow(self, row):
return self.writer.writerow(
Expand Down Expand Up @@ -108,6 +116,7 @@ def __init__(self, f, dialect=None, encoding='utf-8', errors='strict',
if not any([kwd_name in format_params
for kwd_name in kwds.keys()]):
dialect = csv.excel
kwds = _encode_kwds(kwds, encoding, errors)
self.reader = csv.reader(f, dialect, **kwds)
self.encoding = encoding
self.encoding_errors = errors
Expand Down Expand Up @@ -162,6 +171,7 @@ def __init__(self, csvfile, fieldnames, restval='',
extrasaction='raise', dialect='excel', encoding='utf-8',
errors='strict', *args, **kwds):
self.encoding = encoding
kwds = _encode_kwds(kwds, encoding, errors)
csv.DictWriter.__init__(self, csvfile, fieldnames, restval,
extrasaction, dialect, *args, **kwds)
self.writer = UnicodeWriter(csvfile, dialect, encoding=encoding,
Expand Down Expand Up @@ -195,6 +205,7 @@ def __init__(self, csvfile, fieldnames=None, restkey=None, restval=None,
**kwds):
if fieldnames is not None:
fieldnames = _stringify_list(fieldnames, encoding)
kwds = _encode_kwds(kwds, encoding, errors)
csv.DictReader.__init__(self, csvfile, fieldnames, restkey, restval,
dialect, *args, **kwds)
self.reader = UnicodeReader(csvfile, dialect, encoding=encoding,
Expand Down