Removed unreachable exceptions. #1260
Merged
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
|
LGTM |
dirk-thomas
reviewed
Jan 29, 2018
| @@ -203,7 +203,7 @@ def _ssh_exec(self, command, address, port, username=None, password=None): | |||
| err_msg = "Unable to establish ssh connection to [%s%s:%s]: %s"%(username_str, address, port, e) | |||
| except socket.error as e: | |||
| # #1824 | |||
| if e[0] == 111: | |||
| if e.args[0] == 111: | |||
There was a problem hiding this comment.
How is this change related to the issue title?
There was a problem hiding this comment.
I updated the description. Also, changing e[0] to e.args[0] wasn't really related - I will create separate PRs the next time. Given that I have deleted my fork, is there any way to fix this on my end? Alternatively, you could cherry pick the first commit and ignore the second.
There was a problem hiding this comment.
Thank you for the additional information.
With the forked repo being delete I am not sure I can cherry-pick individual commits. I will just squash both commits during the merge in this case.
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.
ROSInterruptExceptionis a subclass ofKeyboardInterruptand both exceptions are being handled the same way (pass). I removed theROSInterruptExceptionhandling since it was placed after theKeyboardInterruptand was thus unreachable.