Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removed unreachable exceptions. #1260

Merged
merged 2 commits into from
Jan 31, 2018
Merged

Removed unreachable exceptions. #1260

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cf1f8fb
Replaced e[0] with e.args[0].
ajeetdsouza Dec 13, 2017
9001af3
Removed ROSInterruptException handling after its superclass (Keyboard…
ajeetdsouza Dec 13, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions clients/rospy/src/rospy/rosconsole.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,5 +181,3 @@ def main(argv=None):
error(1, str(e))
except KeyboardInterrupt:
pass
except rospy.ROSInterruptException:
pass
2 changes: 1 addition & 1 deletion tools/roslaunch/src/roslaunch/remoteprocess.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How is this change related to the issue title?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

err_msg = "network connection refused by [%s:%s]"%(address, port)
else:
err_msg = "network error connecting to [%s:%s]: %s"%(address, port, str(e))
Expand Down
1 change: 0 additions & 1 deletion tools/rostopic/src/rostopic/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2123,4 +2123,3 @@ def rostopicmain(argv=None):
sys.stderr.write("ERROR: %s\n"%str(e))
sys.exit(1)
except KeyboardInterrupt: pass
except rospy.ROSInterruptException: pass