Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
30 changes: 18 additions & 12 deletions Lib/csv.py
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,8 @@ def sniff(self, sample, delimiters=None):
Returns a dialect (or None) corresponding to the sample
"""

sample = sample.replace('\r\n', '\n').replace('\r', '\n')

quotechar, doublequote, delimiter, skipinitialspace = \
self._guess_quote_and_delimiter(sample, delimiters)
if not delimiter:
Expand Down Expand Up @@ -328,18 +330,22 @@ def _guess_quote_and_delimiter(self, data, delimiters):
delim = ''
skipinitialspace = 0

# if we see an extra quote between delimiters, we've got a
# double quoted format
dq_regexp = re.compile(
r"((%(delim)s)|^)\W*%(quote)s[^%(delim)s\n]*%(quote)s[^%(delim)s\n]*%(quote)s\W*((%(delim)s)|$)" % \
{'delim':re.escape(delim), 'quote':quotechar}, re.MULTILINE)



if dq_regexp.search(data):
doublequote = True
else:
doublequote = False
# A doubled quote character inside a quoted field means
# a double quoted format. Match whole fields, so that a match
# cannot slide across field boundaries.
doublequote = False
if delim:
dq_regexp = re.compile(
r"(?:(?<=%(delim)s)|^)%(space)s%(quote)s" # ,"
r"((?:%(quote)s%(quote)s|[^%(quote)s]++)*+)" # the body
r"%(quote)s(?:%(delim)s|$)" # ",
% {'delim': re.escape(delim), 'quote': quotechar,
# Skipping spaces after a space rescans them.
'space': ' *+' if delim != ' ' else ''},
re.MULTILINE)
dquotechar = quotechar * 2
doublequote = any(dquotechar in m[1]
for m in dq_regexp.finditer(data))

return (quotechar, doublequote, delim, skipinitialspace)

Expand Down
44 changes: 44 additions & 0 deletions Lib/test/test_csv.py
Original file line number Diff line number Diff line change
Expand Up @@ -1564,6 +1564,50 @@ def test_zero_mode_tie_order_colon_first(self):
sniffer.sniff(sample)


def test_sniff_regex_backtracking(self):
# gh-109638: this artificial sample used to take minutes.
sniffer = csv.Sniffer()
sample = '"",' * 100 + '"' * 100 + '0' + '"' * 100 + '0'
self.assertEqual(sniffer.sniff(sample).delimiter, ',')

def test_sniff_doublequote_across_fields(self):
# A quoted field which contains the delimiter, followed by
# an empty quoted field, is not a doubled quote.
sniffer = csv.Sniffer()
sample = '",","",","\n' * 4
dialect = sniffer.sniff(sample)
self.assertEqual(dialect.delimiter, ',')
self.assertEqual(dialect.quotechar, '"')
self.assertIs(dialect.doublequote, False)
self.assertEqual(next(csv.reader(StringIO(sample), dialect)),
[',', '', ','])

def test_sniff_doublequote_record_separators(self):
# The record separator ends a field as a delimiter does.
sniffer = csv.Sniffer()
for sep in '\n', '\r\n', '\r':
with self.subTest(sep=sep):
sample = ('x,"a""b"' + sep + 'y,"c"' + sep) * 2
self.assertIs(sniffer.sniff(sample).doublequote, True)
sample = ('"",","' + sep) * 4
self.assertIs(sniffer.sniff(sample).doublequote, False)

def test_sniff_single_column(self):
# This sample used to be quadratic.
sniffer = csv.Sniffer()
sample = '"a"\n' + ' ' * 100000
with self.assertRaisesRegex(csv.Error, "Could not determine delimiter"):
sniffer.sniff(sample, delimiters=',;')

def test_sniff_space_delimiter(self):
# This sample used to be quadratic.
sniffer = csv.Sniffer()
sample = '"a" "b"\n' + ' ' * 100000
dialect = sniffer.sniff(sample)
self.assertEqual(dialect.delimiter, ' ')
self.assertIs(dialect.doublequote, False)


class NUL:
def write(s, *args):
pass
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Fix exponential time in :meth:`csv.Sniffer.sniff` for a sample which contains
many quote characters. A doubled quote character is now also detected in
a field which contains the delimiter or a line break.
Loading