Fix/gh 2680 #2711
Merged
Fix/gh 2680 #2711
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
These methods intend to replace current blender() logic in a per-property level. The _resolve() method is used for non-dict properties (booleans, strings, lists), _resolve_dict() is a special-case merger for dictionaries. Also in order to support '!foo' syntax the dict_removals() function is now split in two: - dict_annihilate - dict_removals The new function dict_annihilate takes a single dict as an argument and is used by _resove_dict().
It's been replace with _resolve and _resolve_dict.
heroin-moose
force-pushed
the
fix/gh-2680
branch
from
2a9285b
to
dccffb2
Compare
SchoolGuy
reviewed
Jul 15, 2021
| if self.parent is not None and hasattr(self.parent, property_name): | ||
| return getattr(self.parent, property_name) | ||
| elif hasattr(settings, property_name): | ||
| return getattr(settings, property_name) |
There was a problem hiding this comment.
Well I like that but that means that we have to change some settings. For example with virt_ram we currently have that in the settings as default_virt_ram but we can make that work either through migrations or another if/else branch. So this is not a blocker for me. The error message below is clearly saying what the problem would be...
SchoolGuy
approved these changes
Jul 15, 2021
nodeg
reviewed
Jul 15, 2021
There was a problem hiding this comment.
Thanks @heroin-moose!
I left some suggestions. Furthermore the line lenght should be extended to 120, especially for the comments.
Comment on lines
+184
to
+186
| traverses the tree from the object to it's topmost parent and returns | ||
| the first value that is not inherited. If the the tree does not contain | ||
| a value the Settings are consulted. |
There was a problem hiding this comment.
Suggested change
| traverses the tree from the object to it's topmost parent and returns | |
| the first value that is not inherited. If the the tree does not contain | |
| a value the Settings are consulted. | |
| traverses the tree from the object to its topmost parent and returns | |
| the first value that is not inherited. If the tree does not contain | |
| a value the settings are consulted. |
| raise AttributeError("%s \"%s\" did not have the attribute \"%s\"" | ||
| % (type(self), self.name, attribute_name)) | ||
| AttributeError("%s \"%s\" inherits property \"%s\", but neither" | ||
| " it's parent nor settings have it" |
There was a problem hiding this comment.
Suggested change
| " it's parent nor settings have it" | |
| " its parent nor settings have it" |
| def _resolve_dict(self, property_name: str) -> dict: | ||
| """ | ||
| Merge the ``property_name`` dictionary of the object with the | ||
| ``property_name`` of all it's parents. The value of the child takes |
There was a problem hiding this comment.
Suggested change
| ``property_name`` of all it's parents. The value of the child takes | |
| ``property_name`` of all its parents. The value of the child takes |
|
Since this goes into my PR, I will just jump in and do @nodeg 's suggestions in my PR quickly and squash them back into your Commits @heroin-moose |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #2680