-
-
Notifications
You must be signed in to change notification settings - Fork 30.2k
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.
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
gh-109638: Fix for significant backtracking in csv.Sniffer #109639
base: main
Are you sure you want to change the base?
Conversation
This comment was marked as resolved.
This comment was marked as resolved.
This comment was marked as resolved.
This comment was marked as resolved.
This reverts commit 16d9612.
Lib/csv.py
Outdated
@@ -270,8 +270,9 @@ def _guess_quote_and_delimiter(self, data, delimiters): | |||
|
|||
# if we see an extra quote between delimiters, we've got a | |||
# double quoted format | |||
# in future Python versions this zero width look-ahead assert can be replaced with atomic groups |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please may you explain this comment?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sure, this zero-width lookahead assertion change in the Regex can be done with an atomic group which is cleaner and more concise.
# Current change
(,|^)\W*"(?=(?P<zero>[^,|"\n]*))(?P=zero)"[^,|\n]*"\W*(,|$)
# Atomic Group
(,|^)\W*"(?>[^,|"\n]*)"[^,|\n]*"\W*(,|$)
But atomic groups are only supported in Python 3.11 onwards so I avoided using them here.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks Sean. This PR (if merged) would be part of Python 3.13, so let's use the better atomic group method.
A
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sure, I've switched us to the simpler atomic group setup. Performance is identical to the previous fix.
#109638 it is possible to get significant backtracking in
csv.Sniffer()
inside the doublequote checking regex. This change introduces a zero-length lookahead assertion to reduce the amount of backtracking.This yields a significant improvement in testing