Handles empty globes properly #297
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
added 6 commits
September 28, 2017 13:44
Behery
changed the title
jihoonl
requested changes
Sep 29, 2017
rosapi/src/rosapi/proxy.py
Outdated
| if(possible_action_server == namespace and topic == "result"): | ||
| possibility[3] = 1 | ||
| if(possible_action_server == namespace and topic == "status"): | ||
| possibility[4] = 1 |
There was a problem hiding this comment.
Thanks for fixing this method too.
filter_action_servers method can be simplified like this way. Could you make this change?
possibility = [0, 0, 0, 0, 0]
action_topics = ['cancel', 'feedback', 'goal', 'result', 'status']
for topic in sorted(topics):
if (len(topic.split('/')) == 3):
[empty, namespace, topic] = topic.split('/')
if(possible_action_server != namespace):
possible_action_server = namespace
possibility = [0, 0, 0, 0, 0]
if possible_action_server == namespace and topic in action_topics:
possibility[action_topics.index(topic)] = 1
if all(p == 1 for p in possibility):
action_servers.append(possible_action_server)
rosapi/src/rosapi/proxy.py
Outdated
| @@ -45,16 +45,20 @@ | |||
|
|
|||
| from rosapi.msg import TypeDef | |||
|
|
|||
| from glob_helper import filter_globs, any_match | |||
There was a problem hiding this comment.
Use from .glob_helper import filter_globs, any_match to import from local module.
|
Hi @jihoonl could you please check the latest updates? |
jihoonl
approved these changes
Oct 2, 2017
|
Thanks. |
jihoonl
pushed a commit
that referenced
this pull request
Oct 16, 2017
* Refactors get_globs function to a separate module * Refactors the filtering that uses the globs * Some linting * Handles topic types for empty globs * Refactors out an any_match function * Simplifies filter_action_servers * Imports socket for the errors * Uses import .glob_helper
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.
The api is now able to handle empty globs. Meaning that the service calls are now functional even if all the topics/services/params are exposed. Fixes #296