From c74e9fb18917ceb287c3ed5be5d0c2a16a646a99 Mon Sep 17 00:00:00 2001
From: Serhiy Storchaka <storchaka@gmail.com>
Date: Mon, 4 Dec 2023 13:30:32 +0200
Subject: [PATCH] gh-110275: Named tuple's __replace__() now raises TypeError
 for invalid arguments (GH-110299)

---
 Doc/library/collections.rst                                 | 4 ++++
 Lib/collections/__init__.py                                 | 2 +-
 Lib/test/test_collections.py                                | 6 +-----
 Lib/test/test_copy.py                                       | 2 +-
 .../Library/2023-11-08-16-11-04.gh-issue-110275.Bm6GwR.rst  | 2 ++
 5 files changed, 9 insertions(+), 7 deletions(-)
 create mode 100644 Misc/NEWS.d/next/Library/2023-11-08-16-11-04.gh-issue-110275.Bm6GwR.rst

diff --git a/Doc/library/collections.rst b/Doc/library/collections.rst
index 17dd6da7479..233b2c6a771 100644
--- a/Doc/library/collections.rst
+++ b/Doc/library/collections.rst
@@ -981,6 +981,10 @@ field names, the method and attribute names start with an underscore.
 
     Named tuples are also supported by generic function :func:`copy.replace`.
 
+    .. versionchanged:: 3.13
+       Raise :exc:`TypeError` instead of :exc:`ValueError` for invalid
+       keyword arguments.
+
 .. attribute:: somenamedtuple._fields
 
     Tuple of strings listing the field names.  Useful for introspection
diff --git a/Lib/collections/__init__.py b/Lib/collections/__init__.py
index a461550ea40..2e527dfd810 100644
--- a/Lib/collections/__init__.py
+++ b/Lib/collections/__init__.py
@@ -457,7 +457,7 @@ def namedtuple(typename, field_names, *, rename=False, defaults=None, module=Non
     def _replace(self, /, **kwds):
         result = self._make(_map(kwds.pop, field_names, self))
         if kwds:
-            raise ValueError(f'Got unexpected field names: {list(kwds)!r}')
+            raise TypeError(f'Got unexpected field names: {list(kwds)!r}')
         return result
 
     _replace.__doc__ = (f'Return a new {typename} object replacing specified '
diff --git a/Lib/test/test_collections.py b/Lib/test/test_collections.py
index bb8b352518e..7e6f811e17c 100644
--- a/Lib/test/test_collections.py
+++ b/Lib/test/test_collections.py
@@ -488,12 +488,8 @@ class TestNamedTuple(unittest.TestCase):
         self.assertEqual(p._replace(x=1), (1, 22))      # test _replace method
         self.assertEqual(p._asdict(), dict(x=11, y=22)) # test _asdict method
 
-        try:
+        with self.assertRaises(TypeError):
             p._replace(x=1, error=2)
-        except ValueError:
-            pass
-        else:
-            self._fail('Did not detect an incorrect fieldname')
 
         # verify that field string can have commas
         Point = namedtuple('Point', 'x, y')
diff --git a/Lib/test/test_copy.py b/Lib/test/test_copy.py
index 60735ba89a8..89102373759 100644
--- a/Lib/test/test_copy.py
+++ b/Lib/test/test_copy.py
@@ -952,7 +952,7 @@ class TestReplace(unittest.TestCase):
                 self.assertEqual(copy.replace(p, x=1), (1, 22))
                 self.assertEqual(copy.replace(p, y=2), (11, 2))
                 self.assertEqual(copy.replace(p, x=1, y=2), (1, 2))
-                with self.assertRaisesRegex(ValueError, 'unexpected field name'):
+                with self.assertRaisesRegex(TypeError, 'unexpected field name'):
                     copy.replace(p, x=1, error=2)
 
     def test_dataclass(self):
diff --git a/Misc/NEWS.d/next/Library/2023-11-08-16-11-04.gh-issue-110275.Bm6GwR.rst b/Misc/NEWS.d/next/Library/2023-11-08-16-11-04.gh-issue-110275.Bm6GwR.rst
new file mode 100644
index 00000000000..194dd5cb623
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2023-11-08-16-11-04.gh-issue-110275.Bm6GwR.rst
@@ -0,0 +1,2 @@
+Named tuple's methods ``_replace()`` and ``__replace__()`` now raise
+TypeError instead of ValueError for invalid keyword arguments.