Fastpath: Add ooni_run_link_id support #768
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
FedericoCeratto
force-pushed
the
fastpath_ooni_run_link_id
branch
2 times, most recently
from
36ea57e to
ef88df5
Compare
FedericoCeratto
force-pushed
the
fastpath_ooni_run_link_id
branch
from
2962bb8 to
0cd0af3
Compare
hellais
reviewed
Nov 20, 2023
fastpath/fastpath/core.py
Outdated
Comment on lines
1665
to
1672
| ooni_run_link_id_str = g_or(annot, "ooni_run_link_id", "") | ||
| if ooni_run_link_id_str: | ||
| try: | ||
| ooni_run_link_id = int(ooni_run_link_id_str) | ||
| except ValueError: | ||
| ooni_run_link_id = None | ||
| else: | ||
| ooni_run_link_id = None |
There was a problem hiding this comment.
Isn't it a bit more clear to rewrite this as:
Suggested change
| ooni_run_link_id_str = g_or(annot, "ooni_run_link_id", "") | |
| if ooni_run_link_id_str: | |
| try: | |
| ooni_run_link_id = int(ooni_run_link_id_str) | |
| except ValueError: | |
| ooni_run_link_id = None | |
| else: | |
| ooni_run_link_id = None | |
| ooni_run_link_id_str = g_or(annot, "ooni_run_link_id", None) | |
| try: | |
| ooni_run_link_id = int(ooni_run_link_id_str) | |
| except (TypeError, ValueError): | |
| ooni_run_link_id = None |
?
There was a problem hiding this comment.
It would be shorter but it would raise and catch an exception around int() even for the expected value "".
There was a problem hiding this comment.
It would not raise the exception, since int("") throws a ValueError which is caught by the handler.
It's equivalent to the previous code.
hellais
reviewed
Nov 20, 2023
|
0.84~pr768-221 deployed on -test |
|
0.84~pr768-221 deployed on FSN |
4 tasks
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.
Implements: #701
Specs: ooni/spec@220aaea