Port #52305 to master #56785
Merged
Port #52305 to master #56785
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
ghost
requested review from
|
@xeacott Test failures look legit |
dwoz
requested changes
May 4, 2020
salt/fileclient.py
Outdated
| @@ -46,8 +47,6 @@ | |||
| ) | |||
| from salt.utils.openstack.swift import SaltSwift | |||
|
|
|||
| # pylint: enable=no-name-in-module,import-error | |||
There was a problem hiding this comment.
I'm not down with removing these for the whole file.
salt/fileclient.py
Outdated
| @@ -551,7 +571,7 @@ def s3_opt(key, default=None): | |||
| https_enable=s3_opt("https_enable", True), | |||
| ) | |||
| return dest | |||
| except Exception as exc: # pylint: disable=broad-except | |||
There was a problem hiding this comment.
This shouldn't be changing unless we are actually going to put a more applicable exception type here (which would be the preference).
|
Thanks for reviewing, I'll add them back. This PR was very troublesome not sure how all the extra changes weren't caught by the linter... |
cmcmarrow
approved these changes
May 6, 2020
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?
What issues does this PR fix or reference?
Fixes:
Previous Behavior
Remove this section if not relevant
New Behavior
Remove this section if not relevant
Merge requirements satisfied?
[NOTICE] Bug fixes or features added to Salt require tests.
Commits signed with GPG?
Yes/No
Please review Salt's Contributing Guide for best practices.
See GitHub's page on GPG signing for more information about signing commits with GPG.