Issue #24931: Resolve __dict__ conflict in namedtuple subclasses.
diff --git a/Doc/library/collections.rst b/Doc/library/collections.rst
index 766bd38..347cf1f 100644
--- a/Doc/library/collections.rst
+++ b/Doc/library/collections.rst
@@ -816,10 +816,10 @@
.. method:: somenamedtuple._asdict()
Return a new :class:`OrderedDict` which maps field names to their corresponding
- values. Note, this method is no longer needed now that the same effect can
- be achieved by using the built-in :func:`vars` function::
+ values::
- >>> vars(p)
+ >>> p = Point(x=11, y=22)
+ >>> p._asdict()
OrderedDict([('x', 11), ('y', 22)])
.. versionchanged:: 3.1
diff --git a/Lib/collections/__init__.py b/Lib/collections/__init__.py
index 565ae86..09afc8a 100644
--- a/Lib/collections/__init__.py
+++ b/Lib/collections/__init__.py
@@ -272,23 +272,14 @@
'Return a nicely formatted representation string'
return self.__class__.__name__ + '({repr_fmt})' % self
- @property
- def __dict__(self):
- 'A new OrderedDict mapping field names to their values'
- return OrderedDict(zip(self._fields, self))
-
def _asdict(self):
'Return a new OrderedDict which maps field names to their values.'
- return self.__dict__
+ return OrderedDict(zip(self._fields, self))
def __getnewargs__(self):
'Return self as a plain tuple. Used by copy and pickle.'
return tuple(self)
- def __getstate__(self):
- 'Exclude the OrderedDict from pickling'
- return None
-
{field_defs}
"""
diff --git a/Lib/test/test_collections.py b/Lib/test/test_collections.py
index df1c63c..66db90f 100644
--- a/Lib/test/test_collections.py
+++ b/Lib/test/test_collections.py
@@ -225,7 +225,6 @@
self.assertEqual(p._fields, ('x', 'y')) # test _fields attribute
self.assertEqual(p._replace(x=1), (1, 22)) # test _replace method
self.assertEqual(p._asdict(), dict(x=11, y=22)) # test _asdict method
- self.assertEqual(vars(p), p._asdict()) # verify that vars() works
try:
p._replace(x=1, error=2)
@@ -380,6 +379,17 @@
globals().pop('NTColor', None) # clean-up after this test
+ def test_namedtuple_subclass_issue_24931(self):
+ class Point(namedtuple('_Point', ['x', 'y'])):
+ pass
+
+ a = Point(3, 4)
+ self.assertEqual(a._asdict(), OrderedDict([('x', 3), ('y', 4)]))
+
+ a.w = 5
+ self.assertEqual(a.__dict__, {'w': 5})
+
+
################################################################################
### Abstract Base Classes
################################################################################
diff --git a/Misc/NEWS b/Misc/NEWS
index b74b15c..0b46451 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -78,6 +78,10 @@
- Issue #21112: Fix regression in unittest.expectedFailure on subclasses.
Patch from Berker Peksag.
+- Issue #24931: Instances of subclasses of namedtuples have their own __dict__
+ which breaks the inherited __dict__ property and breaks the _asdict() method.
+ Removed the __dict__ property to prevent the conflict and fixed _asdict().
+
- Issue #24764: cgi.FieldStorage.read_multi() now ignores the Content-Length
header in part headers. Patch written by Peter Landry and reviewed by Pierre
Quentel.