Small tweaks to simplify the code #325
Open
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
added 3 commits
January 29, 2020 17:41
str.startswith can accept a tuple, no need to use for loop. Signed-off-by: Joe Guo <[email protected]>
simplify the logic of setup file path Signed-off-by: Joe Guo <[email protected]>
can return safe_load result directly, no need to update the result to another temp dict. Signed-off-by: Joe Guo <[email protected]>
ajkavanagh
requested changes
Jun 29, 2022
Comment on lines
23
to
+25
| ZAZA_SETUP_FILE_LOCATIONS = [ | ||
| '{home}/.zaza.yaml'] | ||
| expandvars('$HOME/.zaza.yaml'), | ||
| ] |
There was a problem hiding this comment.
In the same way as line 35 change, this could also be a tuple.
However, I would leave out the expandvars() call here, and delay it to where the string is used. This is because it's just about possible that the HOME env will change between load time of the module and use time of the function.
| valid = True | ||
| break | ||
| return valid | ||
| return key.startswith(VALID_ENVIRONMENT_KEY_PREFIXES) |
There was a problem hiding this comment.
Nice optimisation; might be useful to add a comment indicating that .startswith() can also take the tuple of values to match against (which I didn't know about! - TIL!)
Comment on lines
+131
to
+132
| if os.path.isfile(setup_file): | ||
| return setup_file |
There was a problem hiding this comment.
Do the expandvars() call here to be consistent with the current semantics of the function; i.e. evaluate the HOME env in this function rather than at module load time.
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.
No description provided.