mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 10:19:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

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

Browse source 
(cherry picked from commit a3327dbfd4)

Co-authored-by: Mikołaj Kuranowski <mkuranowski@gmail.com>
This commit is contained in:
Miss Islington (bot) 2024-08-09 18:04:29 +02:00 • committed by GitHub
parent c57a33d006
commit 9d7209fc93
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 5 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Lib/test/test_csv.py
View file

@ -425,6 +425,8 @@ class Test_Csv(unittest.TestCase):
quoting=csv.QUOTE_NONNUMERIC) quoting=csv.QUOTE_NONNUMERIC)
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='\\')
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`) which start with an escape character.

2
Modules/_csv.c
View file

@ -701,6 +701,8 @@ 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 */
if (dialect->quoting == QUOTE_NONNUMERIC)
self->numeric_field = 1;
self->state = ESCAPED_CHAR; self->state = ESCAPED_CHAR;
} }
else if (c == ' ' && dialect->skipinitialspace) else if (c == ' ' && dialect->skipinitialspace)