Commit 6dd38c2a by James Cammarata

Fix parent attribute lookup to be default

Fixes #12526
parent a1c38a3f
...@@ -105,7 +105,10 @@ class Base: ...@@ -105,7 +105,10 @@ class Base:
if hasattr(self, method): if hasattr(self, method):
return getattr(self, method)() return getattr(self, method)()
return self._attributes[prop_name] value = self._attributes[prop_name]
if value is None and hasattr(self, '_get_parent_attribute'):
value = self._get_parent_attribute(prop_name)
return value
@staticmethod @staticmethod
def _generic_s(prop_name, self, value): def _generic_s(prop_name, self, value):
......
...@@ -271,45 +271,50 @@ class Block(Base, Become, Conditional, Taggable): ...@@ -271,45 +271,50 @@ class Block(Base, Become, Conditional, Taggable):
Generic logic to get the attribute or parent attribute for a block value. Generic logic to get the attribute or parent attribute for a block value.
''' '''
value = self._attributes[attr] value = None
if self._parent_block and (value is None or extend): try:
parent_value = getattr(self._parent_block, attr) value = self._attributes[attr]
if extend:
value = self._extend_value(value, parent_value) if self._parent_block and (value is None or extend):
else: parent_value = getattr(self._parent_block, attr)
value = parent_value if extend:
if self._task_include and (value is None or extend): value = self._extend_value(value, parent_value)
parent_value = getattr(self._task_include, attr) else:
if extend: value = parent_value
value = self._extend_value(value, parent_value) if self._task_include and (value is None or extend):
else: parent_value = getattr(self._task_include, attr)
value = parent_value if extend:
if self._role and (value is None or extend): value = self._extend_value(value, parent_value)
parent_value = getattr(self._role, attr) else:
if extend: value = parent_value
value = self._extend_value(value, parent_value) if self._role and (value is None or extend):
else: parent_value = getattr(self._role, attr)
value = parent_value if extend:
value = self._extend_value(value, parent_value)
if len(self._dep_chain) and (not value or extend): else:
reverse_dep_chain = self._dep_chain[:] value = parent_value
reverse_dep_chain.reverse()
for dep in reverse_dep_chain: if len(self._dep_chain) and (not value or extend):
dep_value = getattr(dep, attr) reverse_dep_chain = self._dep_chain[:]
if extend: reverse_dep_chain.reverse()
value = self._extend_value(value, dep_value) for dep in reverse_dep_chain:
else: dep_value = getattr(dep, attr)
value = dep_value if extend:
value = self._extend_value(value, dep_value)
if value is not None and not extend: else:
break value = dep_value
if self._play and (value is None or extend): if value is not None and not extend:
parent_value = getattr(self._play, attr) break
if extend:
value = self._extend_value(value, parent_value) if self._play and (value is None or extend):
else: parent_value = getattr(self._play, attr)
value = parent_value if extend:
value = self._extend_value(value, parent_value)
else:
value = parent_value
except KeyError:
pass
return value return value
......
...@@ -363,19 +363,25 @@ class Task(Base, Conditional, Taggable, Become): ...@@ -363,19 +363,25 @@ class Task(Base, Conditional, Taggable, Become):
''' '''
Generic logic to get the attribute or parent attribute for a task value. Generic logic to get the attribute or parent attribute for a task value.
''' '''
value = self._attributes[attr] value = None
if self._block and (value is None or extend): try:
parent_value = getattr(self._block, attr) value = self._attributes[attr]
if extend:
value = self._extend_value(value, parent_value) if self._block and (value is None or extend):
else: parent_value = getattr(self._block, attr)
value = parent_value if extend:
if self._task_include and (value is None or extend): value = self._extend_value(value, parent_value)
parent_value = getattr(self._task_include, attr) else:
if extend: value = parent_value
value = self._extend_value(value, parent_value) if self._task_include and (value is None or extend):
else: parent_value = getattr(self._task_include, attr)
value = parent_value if extend:
value = self._extend_value(value, parent_value)
else:
value = parent_value
except KeyError:
pass
return value return value
def _get_attr_environment(self): def _get_attr_environment(self):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment