commit 24dc75365e4b6903e3c77a9e480451fb3e31b55b
author R David Murray <rdmurray@bitdance.com> Sat Jun 29 18:43:59 2013 -0400
committer R David Murray <rdmurray@bitdance.com> Sat Jun 29 18:43:59 2013 -0400
tree 3424504216b56a95da1e061478f05b9d34682d0e
parent 1d14246b7750e0954962c71eb30bd3243032df13

#18155: Regex-escape delimiter, in case it is a regex special char.

Patch by Vajrasky Kok, with slight modification to the tests by me.

Lib/csv.py

diff --git a/Lib/csv.py b/Lib/csv.py
index 984ed7e..98480ba 100644
--- a/Lib/csv.py
+++ b/Lib/csv.py
@@ -261,8 +261,9 @@
 
         # 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':delim, 'quote':quotechar}, re.MULTILINE)
+        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)