Add error-checking to namedtuple's _replace() method.

diff --git a/Doc/library/collections.rst b/Doc/library/collections.rst
index 34c311867bb5d95cb96e4d1e632c4520d23114f5..eaa823a92629c190ac81ffba4b1e3adac721892a 100644 (file)
--- a/Doc/library/collections.rst
+++ b/Doc/library/collections.rst
@@ -410,7 +410,10 @@ Example::
 
            def _replace(self, **kwds):
                'Return a new Point object replacing specified fields with new values'
-               return self.__class__._make(map(kwds.get, ('x', 'y'), self))
+               result = self.__class__._make(map(kwds.pop, ('x', 'y'), self))
+               if kwds:
+                   raise ValueError('Got unexpected field names: %r' % kwds.keys())
+               return result
 
            x = property(itemgetter(0))
            y = property(itemgetter(1))

diff --git a/Lib/collections.py b/Lib/collections.py
index 2a58b86ee88a3e1c215dd9fa782c230fa887b116..9985f93fc9639ed44622d0c3d2b5bc735485e1b0 100644 (file)
--- a/Lib/collections.py
+++ b/Lib/collections.py
@@ -78,7 +78,10 @@ def namedtuple(typename, field_names, verbose=False):
             return {%(dicttxt)s} \n
         def _replace(self, **kwds):
             'Return a new %(typename)s object replacing specified fields with new values'
-            return self.__class__._make(map(kwds.get, %(field_names)r, self)) \n\n''' % locals()
+            result = self.__class__._make(map(kwds.pop, %(field_names)r, self))
+            if kwds:
+                raise ValueError('Got unexpected field names: %%r' %% kwds.keys())
+            return result \n\n''' % locals()
     for i, name in enumerate(field_names):
         template += '        %s = property(itemgetter(%d))\n' % (name, i)
     if verbose:

diff --git a/Lib/test/test_collections.py b/Lib/test/test_collections.py
index c17b76dffebdbf9cb10b0fd76f07857f2f6fcf9c..dd9982af3c29a95eff07c08452420cb32016a838 100644 (file)
--- a/Lib/test/test_collections.py
+++ b/Lib/test/test_collections.py
@@ -55,6 +55,13 @@ 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:
+            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')
         p = Point(x=11, y=22)