From fdf51e9a967a0d488e89d60c6409c86fb8b41513 Mon Sep 17 00:00:00 2001 From: Toshio Kuratomi Date: Mon, 23 Mar 2015 16:14:34 -0700 Subject: [PATCH] Use class.mro() instead of custom base_class finder code --- v2/ansible/playbook/base.py | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/v2/ansible/playbook/base.py b/v2/ansible/playbook/base.py index c33dde858f..2a42441309 100644 --- a/v2/ansible/playbook/base.py +++ b/v2/ansible/playbook/base.py @@ -97,17 +97,7 @@ class Base: def munge(self, ds): ''' infrequently used method to do some pre-processing of legacy terms ''' - def _get_base_classes_munge(target_class): - base_classes = list(target_class.__bases__[:]) - for base_class in target_class.__bases__: - base_classes.extend( _get_base_classes_munge(base_class)) - return base_classes - - base_classes = list(self.__class__.__bases__[:]) - for base_class in self.__class__.__bases__: - base_classes.extend(_get_base_classes_munge(base_class)) - - for base_class in base_classes: + for base_class in self.__class__.mro(): method = getattr(self, "_munge_%s" % base_class.__name__.lower(), None) if method: return method(ds)