rosnode: Minor fixes for compatibility with both Python 2 & 3 #1166
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
|
Please provide a reproducible example. |
kartikmohta
commented
Sep 14, 2017
| @@ -182,7 +182,6 @@ def get_nodes_by_machine(machine): | |||
| @raise ROSNodeException: if machine name cannot be resolved to an address | |||
| @raise ROSNodeIOException: if unable to communicate with master | |||
| """ | |||
| import urlparse | |||
There was a problem hiding this comment.
Already imported at the top of the file so no need to import here. Moreover there is no urlparse module in Python 3.
| @@ -338,7 +337,7 @@ def rosnode_ping(node_name, max_count=None, verbose=False): | |||
| # 3786: catch ValueError on unpack as socket.error is not always a tuple | |||
| try: | |||
| # #3659 | |||
| errnum, msg = e | |||
| errnum, msg = e.args | |||
There was a problem hiding this comment.
This way allows it to work for both Python 2 & 3. socket.error is just an alias of OSError in Python 3.
|
Thank you for the patch. Please include a description in future contributions. |
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.
No description provided.