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,7 +271,10 @@ class Block(Base, Become, Conditional, Taggable): ...@@ -271,7 +271,10 @@ 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 = None
try:
value = self._attributes[attr] value = self._attributes[attr]
if self._parent_block and (value is None or extend): if self._parent_block and (value is None or extend):
parent_value = getattr(self._parent_block, attr) parent_value = getattr(self._parent_block, attr)
if extend: if extend:
...@@ -310,6 +313,8 @@ class Block(Base, Become, Conditional, Taggable): ...@@ -310,6 +313,8 @@ class Block(Base, Become, Conditional, Taggable):
value = self._extend_value(value, parent_value) value = self._extend_value(value, parent_value)
else: else:
value = parent_value value = parent_value
except KeyError:
pass
return value return value
......
...@@ -363,7 +363,10 @@ class Task(Base, Conditional, Taggable, Become): ...@@ -363,7 +363,10 @@ 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 = None
try:
value = self._attributes[attr] value = self._attributes[attr]
if self._block and (value is None or extend): if self._block and (value is None or extend):
parent_value = getattr(self._block, attr) parent_value = getattr(self._block, attr)
if extend: if extend:
...@@ -376,6 +379,9 @@ class Task(Base, Conditional, Taggable, Become): ...@@ -376,6 +379,9 @@ class Task(Base, Conditional, Taggable, Become):
value = self._extend_value(value, parent_value) value = self._extend_value(value, parent_value)
else: else:
value = parent_value 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