Rename salt/utils/docker/ to salt/utils/dockermod/#56857
Merged
dwoz merged 2 commits intosaltstack:masterfrom Apr 23, 2020
Merged
Rename salt/utils/docker/ to salt/utils/dockermod/#56857dwoz merged 2 commits intosaltstack:masterfrom
dwoz merged 2 commits intosaltstack:masterfrom
Conversation
This avoids a module shadowing problem during the loading of the `utils` modules, where `import docker` imports `salt.utils.docker` instead.
ghost
requested review from
dwoz
approved these changes
Apr 23, 2020
3 tasks
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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?
This avoids a module shadowing problem during the loading of the
utilsmodules, whereimport dockerimportssalt.utils.dockerinstead.What issues does this PR fix or reference?
Fixes #56669.
Previous Behavior
It was impossible to use the
dockermodule in the same salt run as thedockerpython package was installed.New Behavior
It is now possible.
Merge requirements satisfied?
Commits signed with GPG?
No