From af304db7e24aa924e123a288d2cb7abb7319b01a Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Fri, 3 Jul 2015 01:25:36 +0100 Subject: [PATCH] Revert "Make the detection code work under Python 3.4" --- salt/utils/config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/utils/config.py b/salt/utils/config.py index 993e55d2ca..73a5a3192b 100644 --- a/salt/utils/config.py +++ b/salt/utils/config.py @@ -501,7 +501,7 @@ class BaseConfigItemMeta(six.with_metaclass(Prepareable, type)): for base in reversed(inspect.getmro(cls)): validate_attributes = getattr(base, '__validate_attributes__', None) if validate_attributes: - if instance.__validate_attributes__.__func__.__code__ is not validate_attributes.__code__: + if instance.__validate_attributes__.__func__ is not base.__validate_attributes__.__func__: # The method was overridden, run base.__validate_attributes__ function base.__validate_attributes__(instance) # Finally, run the instance __validate_attributes__ function