diff --git a/Doc/library/collections.rst b/Doc/library/collections.rst index 741c7a04a94..66d373d2c08 100644 --- a/Doc/library/collections.rst +++ b/Doc/library/collections.rst @@ -605,7 +605,7 @@ Example: def __repr__(self): 'Return a nicely formatted representation string' - return 'Point(x=%r, y=%r)' % self + return self.__class__.__name__ + '(x=%r, y=%r)' % self def _asdict(self): 'Return a new OrderedDict which maps field names to their values' diff --git a/Lib/collections.py b/Lib/collections.py index 2ce46de4883..1a43afbe894 100644 --- a/Lib/collections.py +++ b/Lib/collections.py @@ -240,7 +240,7 @@ def namedtuple(typename, field_names, verbose=False, rename=False): return result \n def __repr__(self): 'Return a nicely formatted representation string' - return '%(typename)s(%(reprtxt)s)' %% self \n + return self.__class__.__name__ + '(%(reprtxt)s)' %% self \n def _asdict(self): 'Return a new OrderedDict which maps field names to their values' return OrderedDict(zip(self._fields, self)) \n diff --git a/Lib/test/test_collections.py b/Lib/test/test_collections.py index 69c4a9f173e..2af94bff4c4 100644 --- a/Lib/test/test_collections.py +++ b/Lib/test/test_collections.py @@ -218,6 +218,16 @@ class TestNamedTuple(unittest.TestCase): # test __getnewargs__ self.assertEqual(t.__getnewargs__(), values) + def test_repr(self): + with support.captured_stdout() as template: + A = namedtuple('A', 'x', verbose=True) + self.assertEqual(repr(A(1)), 'A(x=1)') + # repr should show the name of the subclass + class B(A): + pass + self.assertEqual(repr(B(1)), 'B(x=1)') + + class ABCTestCase(unittest.TestCase): def validate_abstract_methods(self, abc, *names): diff --git a/Misc/NEWS b/Misc/NEWS index 4f99d70674c..c0e3fc7ce6d 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -24,6 +24,9 @@ Core and Builtins Extensions ---------- +- Issue #9507: Named tuple repr will now automatically display the right + name in a tuple subclass. + - Issue #9324: Add parameter validation to signal.signal on Windows in order to prevent crashes.