diff options
| author | R David Murray <rdmurray@bitdance.com> | 2016-09-08 13:59:53 -0400 |
|---|---|---|
| committer | R David Murray <rdmurray@bitdance.com> | 2016-09-08 13:59:53 -0400 |
| commit | 44b548dda872c0d4f30afd6b44fd74b053a55ad8 (patch) | |
| tree | b3c1ff8485bc279000f9db95491ebc69a4385876 /Lib/csv.py | |
| parent | 513d7478a136e7646075592da2593476299cc8be (diff) | |
| download | cpython-git-44b548dda872c0d4f30afd6b44fd74b053a55ad8.tar.gz | |
#27364: fix "incorrect" uses of escape character in the stdlib.
And most of the tools.
Patch by Emanual Barry, reviewed by me, Serhiy Storchaka, and
Martin Panter.
Diffstat (limited to 'Lib/csv.py')
| -rw-r--r-- | Lib/csv.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Lib/csv.py b/Lib/csv.py index 2e2303a28e..0481ea5586 100644 --- a/Lib/csv.py +++ b/Lib/csv.py @@ -215,10 +215,10 @@ class Sniffer: """ matches = [] - for restr in ('(?P<delim>[^\w\n"\'])(?P<space> ?)(?P<quote>["\']).*?(?P=quote)(?P=delim)', # ,".*?", - '(?:^|\n)(?P<quote>["\']).*?(?P=quote)(?P<delim>[^\w\n"\'])(?P<space> ?)', # ".*?", - '(?P<delim>>[^\w\n"\'])(?P<space> ?)(?P<quote>["\']).*?(?P=quote)(?:$|\n)', # ,".*?" - '(?:^|\n)(?P<quote>["\']).*?(?P=quote)(?:$|\n)'): # ".*?" (no delim, no space) + for restr in (r'(?P<delim>[^\w\n"\'])(?P<space> ?)(?P<quote>["\']).*?(?P=quote)(?P=delim)', # ,".*?", + r'(?:^|\n)(?P<quote>["\']).*?(?P=quote)(?P<delim>[^\w\n"\'])(?P<space> ?)', # ".*?", + r'(?P<delim>>[^\w\n"\'])(?P<space> ?)(?P<quote>["\']).*?(?P=quote)(?:$|\n)', # ,".*?" + r'(?:^|\n)(?P<quote>["\']).*?(?P=quote)(?:$|\n)'): # ".*?" (no delim, no space) regexp = re.compile(restr, re.DOTALL | re.MULTILINE) matches = regexp.findall(data) if matches: |