diff -r c59d81b802f8 Lib/test/test_enum.py --- a/Lib/test/test_enum.py Tue Mar 31 16:35:35 2015 +0200 +++ b/Lib/test/test_enum.py Tue Mar 31 19:24:29 2015 +0300 @@ -1576,20 +1576,14 @@ class Color(enum.Enum) | ---------------------------------------------------------------------- | Data descriptors inherited from enum.Enum: |\x20\x20 - | name - | The name of the Enum member. + | name%s |\x20\x20 - | value - | The value of the Enum member. + | value%s |\x20\x20 | ---------------------------------------------------------------------- | Data descriptors inherited from enum.EnumMeta: |\x20\x20 - | __members__ - | Returns a mapping of member name->value. - |\x20\x20\x20\x20\x20\x20 - | This mapping lists all enum members, including aliases. Note that this - | is a read-only view of the internal mapping. + | __members__%s """.strip() class TestStdLib(unittest.TestCase): @@ -1601,12 +1595,23 @@ class TestStdLib(unittest.TestCase): def test_pydoc(self): # indirectly test __objclass__ - expected_text = expected_help_output % __name__ + hasdocs = StrEnum.__doc__ is not None + expected_text = expected_help_output % ( + __name__, + '\n | The name of the Enum member.' if hasdocs else '', + '\n | The value of the Enum member.' if hasdocs else '', + """ + | Returns a mapping of member name->value. + |\x20\x20\x20\x20\x20\x20 + | This mapping lists all enum members, including aliases. Note that this + | is a read-only view of the internal mapping.""" if hasdocs else '', + ) output = StringIO() helper = pydoc.Helper(output=output) helper(self.Color) result = output.getvalue().strip() self.assertEqual(result, expected_text) + maxDiff = None def test_inspect_getmembers(self): values = dict((