Clean up exceptions in _rclpy_action #685
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
The main change here is the use of RCLError to replace the repeated pattern of fetching the RCL error string. Signed-off-by: Scott K Logan <logans@cottsay.net>
cottsay
commented
Feb 26, 2021
| @@ -154,17 +151,14 @@ rclpy_action_wait_set_add(py::capsule pyentity, py::capsule pywait_set) | |||
| } else { | |||
| std::string error_text{"Unknown entity: "}; | |||
| error_text += pyentity.name(); | |||
| rcutils_reset_error(); | |||
There was a problem hiding this comment.
Note the removal of this call, which I believe was unnecessary.
cottsay
commented
Feb 26, 2021
| @@ -212,17 +206,14 @@ rclpy_action_wait_set_get_num_entities(py::capsule pyentity) | |||
| } else { | |||
| std::string error_text{"Unknown entity: "}; | |||
| error_text += pyentity.name(); | |||
| rcutils_reset_error(); | |||
There was a problem hiding this comment.
Same as before - I don't see why this was being called.
cottsay
commented
Feb 26, 2021
Comment on lines
-419
to
409
| rcutils_reset_error(); | ||
| rcl_reset_error(); | ||
| throw py::value_error(error_text); | ||
| } else if (ret != RCL_RET_OK) { | ||
| std::string error_text{"Failed to create action client: "}; | ||
| error_text += rcl_get_error_string().str; | ||
| rcutils_reset_error(); | ||
| rcl_reset_error(); | ||
| throw py::value_error(error_text); |
There was a problem hiding this comment.
Also note these changes - it doesn't make sense to call rcutils_reset_error() after rcl_get_error_string().
|
34 tasks
fujitatomoya
reviewed
Mar 1, 2021
fujitatomoya
approved these changes
Mar 1, 2021
delete-merged-branch
bot
deleted the
cottsay/pybind11_rclpy_action_exceptions
branch
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 main change here is the use of RCLError to replace the repeated pattern of fetching the RCL error string.