Skip to content

bpo-12178: Fix escaping of escapechar in csv.writer() #13710

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

Merged
taleinat merged 1 commit into from
Sep 20, 2020
Merged

bpo-12178: Fix escaping of escapechar in csv.writer() #13710

Show file tree
Hide file tree
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
14 changes: 14 additions & 0 deletions Lib/test/test_csv.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,20 @@ def test_write_escape(self):
escapechar='\\', quoting = csv.QUOTE_NONE)
self._write_test(['a',1,'p,q'], 'a,1,p\\,q',
escapechar='\\', quoting = csv.QUOTE_NONE)
self._write_test(['\\', 'a'], '\\\\,a',
escapechar='\\', quoting=csv.QUOTE_NONE)
self._write_test(['\\', 'a'], '\\\\,a',
escapechar='\\', quoting=csv.QUOTE_MINIMAL)
self._write_test(['\\', 'a'], '"\\\\","a"',
escapechar='\\', quoting=csv.QUOTE_ALL)
self._write_test(['\\ ', 'a'], '\\\\ ,a',
escapechar='\\', quoting=csv.QUOTE_MINIMAL)
self._write_test(['\\,', 'a'], '\\\\\\,,a',
escapechar='\\', quoting=csv.QUOTE_NONE)
self._write_test([',\\', 'a'], '",\\\\",a',
escapechar='\\', quoting=csv.QUOTE_MINIMAL)
self._write_test(['C\\', '6', '7', 'X"'], 'C\\\\,6,7,"X"""',
escapechar='\\', quoting=csv.QUOTE_MINIMAL)

def test_write_iterable(self):
self._write_test(iter(['a', 1, 'p,q']), 'a,1,"p,q"')
Expand Down
3 changes: 3 additions & 0 deletions Misc/NEWS.d/next/Library/2019-05-31-23-54-28.bpo-12178.N6FLCZ.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
:func:`csv.writer` now correctly escapes *escapechar* when input
contains *escapechar*. Patch by Catalin Iacob, Berker Peksag,
and Itay Elbirt.
3 changes: 3 additions & 0 deletions Modules/_csv.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1040,6 +1040,9 @@ join_append_data(WriterObj *self, unsigned int field_kind, const void *field_dat
else
want_escape = 1;
}
else if (c == dialect->escapechar) {
want_escape = 1;
}
if (!want_escape)
*quoted = 1;
}
Expand Down