Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

[3.13] gh-113785: csv: fields starting with escapechar are not quoted (GH-122110) (GH-122258) 

(cherry picked from commit a3327dbfd4)

Co-authored-by: Mikołaj Kuranowski <mkuranowski@gmail.com>
This commit is contained in:
Miss Islington (bot) 2024-07-25 09:29:36 +02:00 committed by GitHub
parent 94db4cc5e6
commit 6933c4ace9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Lib/test/test_csv.py
View File

@ -454,6 +454,10 @@ class Test_Csv(unittest.TestCase):
quoting=csv.QUOTE_STRINGS) quoting=csv.QUOTE_STRINGS)
self._read_test(['1,@,3,@,5'], [['1', ',3,', '5']], quotechar='@') self._read_test(['1,@,3,@,5'], [['1', ',3,', '5']], quotechar='@')
self._read_test(['1,\0,3,\0,5'], [['1', ',3,', '5']], quotechar='\0') self._read_test(['1,\0,3,\0,5'], [['1', ',3,', '5']], quotechar='\0')
self._read_test(['1\\.5,\\.5,.5'], [[1.5, 0.5, 0.5]],
quoting=csv.QUOTE_NONNUMERIC, escapechar='\\')
self._read_test(['1\\.5,\\.5,"\\.5"'], [[1.5, 0.5, ".5"]],
quoting=csv.QUOTE_STRINGS, escapechar='\\')
def test_read_skipinitialspace(self): def test_read_skipinitialspace(self):
self._read_test(['no space, space, spaces,\ttab'], self._read_test(['no space, space, spaces,\ttab'],

1
Misc/NEWS.d/next/Library/2024-07-22-08-14-04.gh-issue-113785.6B_KNB.rst Normal file
View File

@ -0,0 +1 @@
:mod:`csv` now correctly parses numeric fields (when used with :const:`csv.QUOTE_NONNUMERIC` or :const:`csv.QUOTE_STRINGS`) which start with an escape character.

1
Modules/_csv.c
View File

@ -749,7 +749,6 @@ parse_process_char(ReaderObj *self, _csvstate *module_state, Py_UCS4 c)
} }
else if (c == dialect->escapechar) { else if (c == dialect->escapechar) {
/* possible escaped character */ /* possible escaped character */
self->unquoted_field = false;
self->state = ESCAPED_CHAR; self->state = ESCAPED_CHAR;
} }
else if (c == ' ' && dialect->skipinitialspace) else if (c == ' ' && dialect->skipinitialspace)