Issue #18830: inspect.getclasstree() no more produces duplicated entries even

when input list contains duplicates.
This commit is contained in:
Serhiy Storchaka 2013-09-05 17:16:12 +03:00
commit 1e0d82cece
4 changed files with 26 additions and 3 deletions

View File

@ -789,7 +789,8 @@ def getclasstree(classes, unique=False):
for parent in c.__bases__: for parent in c.__bases__:
if not parent in children: if not parent in children:
children[parent] = [] children[parent] = []
children[parent].append(c) if c not in children[parent]:
children[parent].append(c)
if unique and parent in classes: break if unique and parent in classes: break
elif c not in roots: elif c not in roots:
roots.append(c) roots.append(c)

View File

@ -49,6 +49,8 @@ class StupidGit:
class MalodorousPervert(StupidGit): class MalodorousPervert(StupidGit):
pass pass
Tit = MalodorousPervert
class ParrotDroppings: class ParrotDroppings:
pass pass

View File

@ -225,8 +225,25 @@ class TestRetrievingSourceCode(GetSourceBase):
[('FesteringGob', mod.FesteringGob), [('FesteringGob', mod.FesteringGob),
('MalodorousPervert', mod.MalodorousPervert), ('MalodorousPervert', mod.MalodorousPervert),
('ParrotDroppings', mod.ParrotDroppings), ('ParrotDroppings', mod.ParrotDroppings),
('StupidGit', mod.StupidGit)]) ('StupidGit', mod.StupidGit),
tree = inspect.getclasstree([cls[1] for cls in classes], 1) ('Tit', mod.MalodorousPervert),
])
tree = inspect.getclasstree([cls[1] for cls in classes])
self.assertEqual(tree,
[(object, ()),
[(mod.ParrotDroppings, (object,)),
[(mod.FesteringGob, (mod.MalodorousPervert,
mod.ParrotDroppings))
],
(mod.StupidGit, (object,)),
[(mod.MalodorousPervert, (mod.StupidGit,)),
[(mod.FesteringGob, (mod.MalodorousPervert,
mod.ParrotDroppings))
]
]
]
])
tree = inspect.getclasstree([cls[1] for cls in classes], True)
self.assertEqual(tree, self.assertEqual(tree,
[(object, ()), [(object, ()),
[(mod.ParrotDroppings, (object,)), [(mod.ParrotDroppings, (object,)),

View File

@ -54,6 +54,9 @@ Core and Builtins
Library Library
------- -------
- Issue #18830: inspect.getclasstree() no more produces duplicated entries even
when input list contains duplicates.
- Issue #18878: sunau.open now supports the context manager protocol. Based on - Issue #18878: sunau.open now supports the context manager protocol. Based on
patches by Claudiu Popa and R. David Murray. patches by Claudiu Popa and R. David Murray.