Fix parsing of csv files with escapes (escape character previously would be
left in stream).
diff --git a/Lib/test/test_csv.py b/Lib/test/test_csv.py
index 6c47c6e..66b0ea9 100644
--- a/Lib/test/test_csv.py
+++ b/Lib/test/test_csv.py
@@ -227,10 +227,10 @@
self.assertRaises(csv.Error, self._read_test, ['a,b\r\nc,d'], [])
def test_read_escape(self):
- self._read_test(['a,\\b,c'], [['a', '\\b', 'c']], escapechar='\\')
+ self._read_test(['a,\\b,c'], [['a', 'b', 'c']], escapechar='\\')
self._read_test(['a,b\\,c'], [['a', 'b,c']], escapechar='\\')
self._read_test(['a,"b\\,c"'], [['a', 'b,c']], escapechar='\\')
- self._read_test(['a,"b,\\c"'], [['a', 'b,\\c']], escapechar='\\')
+ self._read_test(['a,"b,\\c"'], [['a', 'b,c']], escapechar='\\')
self._read_test(['a,"b,c\\""'], [['a', 'b,c"']], escapechar='\\')
self._read_test(['a,"b,c"\\'], [['a', 'b,c\\']], escapechar='\\')
diff --git a/Modules/_csv.c b/Modules/_csv.c
index 893a273..13445b8 100644
--- a/Modules/_csv.c
+++ b/Modules/_csv.c
@@ -584,10 +584,6 @@
break;
case ESCAPED_CHAR:
- if (c != dialect->escapechar &&
- c != dialect->delimiter &&
- c != dialect->quotechar)
- parse_add_char(self, dialect->escapechar);
parse_add_char(self, c);
self->state = IN_FIELD;
break;
@@ -642,10 +638,6 @@
break;
case ESCAPE_IN_QUOTED_FIELD:
- if (c != dialect->escapechar &&
- c != dialect->delimiter &&
- c != dialect->quotechar)
- parse_add_char(self, dialect->escapechar);
parse_add_char(self, c);
self->state = IN_QUOTED_FIELD;
break;