From 3d89057ff80261e8960420305b432cd9783bb4e2 Mon Sep 17 00:00:00 2001 From: Raymond Hettinger Date: Thu, 2 Jun 2011 23:40:24 -0700 Subject: Fix named tuples to work with vars(). --- Doc/library/collections.rst | 2 ++ Lib/collections.py | 2 ++ Lib/test/test_collections.py | 2 +- Misc/NEWS | 2 ++ 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Doc/library/collections.rst b/Doc/library/collections.rst index f3b068c..79db55e 100644 --- a/Doc/library/collections.rst +++ b/Doc/library/collections.rst @@ -623,6 +623,8 @@ they add the ability to access fields by name instead of position index. 'Return a new OrderedDict which maps field names to their values' return OrderedDict(zip(self._fields, self)) + __dict__ = property(_asdict) + def _replace(_self, **kwds): 'Return a new Point object replacing specified fields with new values' result = _self._make(map(kwds.pop, ('x', 'y'), _self)) diff --git a/Lib/collections.py b/Lib/collections.py index b904980..2b6abd8 100644 --- a/Lib/collections.py +++ b/Lib/collections.py @@ -268,6 +268,8 @@ class {typename}(tuple): 'Return a new OrderedDict which maps field names to their values' return OrderedDict(zip(self._fields, self)) + __dict__ = property(_asdict) + def _replace(_self, **kwds): 'Return a new {typename} object replacing specified fields with new values' result = _self._make(map(kwds.pop, {field_names!r}, _self)) diff --git a/Lib/test/test_collections.py b/Lib/test/test_collections.py index 2b7b68b..ccf93c5 100644 --- a/Lib/test/test_collections.py +++ b/Lib/test/test_collections.py @@ -180,12 +180,12 @@ class TestNamedTuple(unittest.TestCase): self.assertRaises(TypeError, eval, 'Point(XXX=1, y=2)', locals()) # wrong keyword argument self.assertRaises(TypeError, eval, 'Point(x=1)', locals()) # missing keyword argument self.assertEqual(repr(p), 'Point(x=11, y=22)') - self.assertNotIn('__dict__', dir(p)) # verify instance has no dict self.assertNotIn('__weakref__', dir(p)) self.assertEqual(p, Point._make([11, 22])) # test _make classmethod 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) diff --git a/Misc/NEWS b/Misc/NEWS index baf235c..16a0f29 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -22,6 +22,8 @@ Core and Builtins Library ------- +- Named tuples now work correctly with vars(). + - Issue #12085: Fix an attribute error in subprocess.Popen destructor if the constructor has failed, e.g. because of an undeclared keyword argument. Patch written by Oleg Oshmyan. -- cgit v0.12