From 34124544f26622cdddfc96793505cf188d1e3197 Mon Sep 17 00:00:00 2001 From: Serhiy Storchaka Date: Mon, 3 Aug 2026 15:26:19 +0300 Subject: [PATCH] [3.15] gh-98820: Fix quadratic time in csv.Sniffer for quoted fields (GH-154867) The regular expressions which look for a quoted field matched its body lazily, so a closing quote which was not followed by a delimiter was retried with every following quote, to the end of the sample. Match the body possessively instead: it ends at the first quote which is not doubled, as it does for a reader. (cherry picked from commit 476fb09cdb0d73e645849d98c610e7e5697ce7c9) Co-authored-by: Serhiy Storchaka Co-authored-by: Claude Opus 5 (1M context) --- Lib/csv.py | 14 +++++++++----- Lib/test/test_csv.py | 7 +++++++ .../2026-07-29-11-20-00.gh-issue-98820.Qm7Hs4.rst | 2 ++ 3 files changed, 18 insertions(+), 5 deletions(-) create mode 100644 Misc/NEWS.d/next/Library/2026-07-29-11-20-00.gh-issue-98820.Qm7Hs4.rst diff --git a/Lib/csv.py b/Lib/csv.py index ff51c9524c68051..5d15344ea2495e1 100644 --- a/Lib/csv.py +++ b/Lib/csv.py @@ -288,12 +288,16 @@ def _guess_quote_and_delimiter(self, data, delimiters): """ import re + # The body of a quoted field ends at the first quote which is + # not doubled, as it does for a reader. A lazy ".*?" scans to + # the end of the sample instead, from every start: quadratically. + body = r'(?:(?P=quote){2}|(?!(?P=quote)).)*+' matches = [] - for restr in (r'(?P[^\w\n"\'])(?P ?)(?P["\']).*?(?P=quote)(?P=delim)', # ,".*?", - r'(?:^|\n)(?P["\']).*?(?P=quote)(?P[^\w\n"\'])(?P ?)', # ".*?", - r'(?P[^\w\n"\'])(?P ?)(?P["\']).*?(?P=quote)(?:$|\r|\n)', # ,".*?" - r'(?:^|\n)(?P["\']).*?(?P=quote)(?:$|\r|\n)'): # ".*?" (no delim, no space) - regexp = re.compile(restr, re.DOTALL | re.MULTILINE) + for restr in (r'(?P[^\w\n"\'])(?P ?)(?P["\'])%s(?P=quote)(?P=delim)', # ,"...", + r'(?:^|\n)(?P["\'])%s(?P=quote)(?P[^\w\n"\'])(?P ?)', # "...", + r'(?P[^\w\n"\'])(?P ?)(?P["\'])%s(?P=quote)(?:$|\n)', # ,"..." + r'(?:^|\n)(?P["\'])%s(?P=quote)(?:$|\n)'): # "..." (no delim, no space) + regexp = re.compile(restr % body, re.DOTALL | re.MULTILINE) matches = regexp.findall(data) if matches: break diff --git a/Lib/test/test_csv.py b/Lib/test/test_csv.py index eaf8583a717dfc1..a521890a8fd9bd9 100644 --- a/Lib/test/test_csv.py +++ b/Lib/test/test_csv.py @@ -1544,6 +1544,13 @@ def test_sniff_space_delimiter(self): self.assertEqual(dialect.delimiter, ' ') self.assertIs(dialect.doublequote, False) + def test_sniff_quoted_single_column(self): + # gh-98820: this sample used to take minutes. + sniffer = csv.Sniffer() + sample = '"abcdefghijklmnopqrstuvwxyz"\n' * 10000 + with self.assertRaisesRegex(csv.Error, "Could not determine delimiter"): + sniffer.sniff(sample, delimiters=',:|\t') + class NUL: def write(s, *args): diff --git a/Misc/NEWS.d/next/Library/2026-07-29-11-20-00.gh-issue-98820.Qm7Hs4.rst b/Misc/NEWS.d/next/Library/2026-07-29-11-20-00.gh-issue-98820.Qm7Hs4.rst new file mode 100644 index 000000000000000..aa9ae8d937004fe --- /dev/null +++ b/Misc/NEWS.d/next/Library/2026-07-29-11-20-00.gh-issue-98820.Qm7Hs4.rst @@ -0,0 +1,2 @@ +Fix quadratic time in :meth:`csv.Sniffer.sniff` for a sample which contains +quoted fields, in particular for a single column of quoted fields.