valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #25139 from saltstack/revert-25136-features/raas-17-salt-cloud-2015.8

Browse Source 
Revert "Make the detection code work under Python 3.4"
This commit is contained in:
Pedro Algarvio 2015-07-03 00:25:45 +01:00
commit a50f74ba88
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
salt/utils/config.py
View File

@ -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