import statement cleanups
#63335
Closed
import statement cleanups
#63335
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
The `salt.loader` module is intentially imported late in `salt.config.call_id_function()` to avoid a circular import error. However, `salt.loader` is also used in `salt.config.mminion_config()`, so import it there as well. This avoids an error if `mminion_config()` is called before `call_id_function()`, or if the import statement in `call_id_function()` is removed in the future.
The delayed `import` statements match `import` statements at the top of the file so they are effectively no-ops.
s0undt3ch
suggested changes
Dec 25, 2022
| import salt.config | ||
| # Without this global declaration, the late `import` statement below causes | ||
| # `salt` to become a function-local variable. | ||
| global salt |
There was a problem hiding this comment.
Let's not make salt a global.
The import that was in place was working.
If we really wanted to fix this import, we'd have to track down the circular import issue, and most likely, it's not an easy circular import to fix.
There was a problem hiding this comment.
salt is already a global, just not in this function (without this change) due to the import statement below.
|
Closing this due to inactivity. Anyone should feel free to re-open it if they want to see it through to the end in one release cycle. |
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.
What does this PR do?
Fixes some minor issues with
importstatements.What issues does this PR fix or reference?
None.
Behavior Changes
None.
Merge requirements satisfied?
[NOTICE] Bug fixes or features added to Salt require tests.
Commits signed with GPG?
No