From e030da58cc6e4b35de43cede9b067a71773ed9b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Kuranowski?= <mkuranowski@gmail.com>
Date: Mon, 22 Jul 2024 10:03:36 +0200
Subject: [PATCH 1/4] gh-113785: csv: fields starting with escapechar are not
 quoted

---
 Lib/test/test_csv.py | 2 ++
 Modules/_csv.c       | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Lib/test/test_csv.py b/Lib/test/test_csv.py
index d74ab7e016f78c..35db2737797f1a 100644
--- a/Lib/test/test_csv.py
+++ b/Lib/test/test_csv.py
@@ -454,6 +454,8 @@ def test_read_quoting(self):
                           quoting=csv.QUOTE_STRINGS)
         self._read_test(['1,@,3,@,5'], [['1', ',3,', '5']], quotechar='@')
         self._read_test(['1,\0,3,\0,5'], [['1', ',3,', '5']], quotechar='\0')
+        self._read_test(['1\\.5,\\.5,.5'], [[1.5, 0.5, 0.5]],
+                        quoting=csv.QUOTE_NONNUMERIC, escapechar='\\')
 
     def test_read_skipinitialspace(self):
         self._read_test(['no space, space,  spaces,\ttab'],
diff --git a/Modules/_csv.c b/Modules/_csv.c
index 9964c383b8ad09..737b2c7468e13c 100644
--- a/Modules/_csv.c
+++ b/Modules/_csv.c
@@ -749,7 +749,6 @@ parse_process_char(ReaderObj *self, _csvstate *module_state, Py_UCS4 c)
         }
         else if (c == dialect->escapechar) {
             /* possible escaped character */
-            self->unquoted_field = false;
             self->state = ESCAPED_CHAR;
         }
         else if (c == ' ' && dialect->skipinitialspace)

From b461b8d083f2ee98ebf8e48c4a6ce496eadb9006 Mon Sep 17 00:00:00 2001
From: "blurb-it[bot]" <43283697+blurb-it[bot]@users.noreply.github.com>
Date: Mon, 22 Jul 2024 08:14:05 +0000
Subject: [PATCH 2/4] =?UTF-8?q?=F0=9F=93=9C=F0=9F=A4=96=20Added=20by=20blu?=
 =?UTF-8?q?rb=5Fit.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../next/Library/2024-07-22-08-14-04.gh-issue-113785.6B_KNB.rst  | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 Misc/NEWS.d/next/Library/2024-07-22-08-14-04.gh-issue-113785.6B_KNB.rst

diff --git a/Misc/NEWS.d/next/Library/2024-07-22-08-14-04.gh-issue-113785.6B_KNB.rst b/Misc/NEWS.d/next/Library/2024-07-22-08-14-04.gh-issue-113785.6B_KNB.rst
new file mode 100644
index 00000000000000..c1118740370a5e
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2024-07-22-08-14-04.gh-issue-113785.6B_KNB.rst
@@ -0,0 +1 @@
+:mod:`csv` now correctly parses numeric fields (when used with :const:`csv.QUOTE_NONNUMERIC`) which start with an escape character.

From 276a746cee66109d94592b5e2cfefc707e11e5f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Kuranowski?= <mkuranowski@gmail.com>
Date: Wed, 24 Jul 2024 17:37:35 +0200
Subject: [PATCH 3/4] csv: test fields starting with escapechar with
 QUOTE_STRINGS

---
 Lib/test/test_csv.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Lib/test/test_csv.py b/Lib/test/test_csv.py
index 35db2737797f1a..c718ee1203cbe0 100644
--- a/Lib/test/test_csv.py
+++ b/Lib/test/test_csv.py
@@ -456,6 +456,8 @@ def test_read_quoting(self):
         self._read_test(['1,\0,3,\0,5'], [['1', ',3,', '5']], quotechar='\0')
         self._read_test(['1\\.5,\\.5,.5'], [[1.5, 0.5, 0.5]],
                         quoting=csv.QUOTE_NONNUMERIC, escapechar='\\')
+        self._read_test(['1\\.5,\\.5,"\\.5"'], [[1.5, 0.5, ".5"]],
+                        quoting=csv.QUOTE_STRINGS, escapechar='\\')
 
     def test_read_skipinitialspace(self):
         self._read_test(['no space, space,  spaces,\ttab'],

From cf05e97ed527587f57dd634d7c2a58422e8e017e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Kuranowski?= <mkuranowski@gmail.com>
Date: Wed, 24 Jul 2024 17:38:04 +0200
Subject: [PATCH 4/4] Update new message for gh-113785 fix

---
 .../next/Library/2024-07-22-08-14-04.gh-issue-113785.6B_KNB.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Misc/NEWS.d/next/Library/2024-07-22-08-14-04.gh-issue-113785.6B_KNB.rst b/Misc/NEWS.d/next/Library/2024-07-22-08-14-04.gh-issue-113785.6B_KNB.rst
index c1118740370a5e..89d44a3f79c390 100644
--- a/Misc/NEWS.d/next/Library/2024-07-22-08-14-04.gh-issue-113785.6B_KNB.rst
+++ b/Misc/NEWS.d/next/Library/2024-07-22-08-14-04.gh-issue-113785.6B_KNB.rst
@@ -1 +1 @@
-:mod:`csv` now correctly parses numeric fields (when used with :const:`csv.QUOTE_NONNUMERIC`) which start with an escape character.
+:mod:`csv` now correctly parses numeric fields (when used with :const:`csv.QUOTE_NONNUMERIC` or :const:`csv.QUOTE_STRINGS`) which start with an escape character.