Fix unbound local error exception #2428
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
Fixes UnboundLocalError local variable 'event_source' referenced before assignment exception Signed-off-by: Kipchirchir Sigei <[email protected]>
Signed-off-by: Kipchirchir Sigei <[email protected]>
Signed-off-by: Kipchirchir Sigei <[email protected]>
|
Let's have this component disabled by default too |
DavisRayM
reviewed
May 23, 2023
onadata/libs/utils/analytics.py
Outdated
| @@ -136,18 +136,16 @@ def get_event_label(self) -> str: | |||
| def get_request_origin(self, request, tracking_properties): | |||
| """Returns the request origin""" | |||
| if isinstance(self.tracked_obj, Instance): | |||
| event_source = "" # Initialize event_source variable | |||
| web_user_agents = ["Chrome", "Mozilla", "Safari", "PostmanRuntime"] | |||
There was a problem hiding this comment.
Postman is used to submit Enketo records ??
Signed-off-by: Kipchirchir Sigei <[email protected]>
Signed-off-by: Kipchirchir Sigei <[email protected]>
DavisRayM
previously approved these changes
May 23, 2023
ukanga
reviewed
May 23, 2023
onadata/libs/utils/analytics.py
Outdated
| @@ -136,18 +136,18 @@ def get_event_label(self) -> str: | |||
| def get_request_origin(self, request, tracking_properties): | |||
| """Returns the request origin""" | |||
| if isinstance(self.tracked_obj, Instance): | |||
| event_source = "" # Initialize event_source variable | |||
There was a problem hiding this comment.
Can we move this line to above line 138 and remove the else clause on line 150?
event_source = "" # Initialize event_source variable
if isinstance(self.tracked_obj, Instance):
event_source = "Submission collected from Web"
browser_user_agents = ["Chrome", "Mozilla", "Safari"]
try:
user_agent = request.META["HTTP_USER_AGENT"]
except KeyError:
pass
if "Android" in user_agent:
event_source = "Submission collected from ODK COLLECT"
elif any(ua in user_agent for ua in browser_user_agents):
event_source = "Submission collected from Enketo"
tracking_properties.update({"from": event_source})
KipSigei
force-pushed
the
fix-UnboundLocalError-exception
branch
from
33ea555
to
9e50282
Compare
DavisRayM
reviewed
May 23, 2023
onadata/libs/utils/analytics.py
Outdated
| event_source = "" | ||
| pass | ||
|
|
||
| if "Android" in user_agent: |
There was a problem hiding this comment.
I believe user_agent won't be defined in scenarios where the KeyError is raised
Signed-off-by: Kipchirchir Sigei <[email protected]>
KipSigei
force-pushed
the
fix-UnboundLocalError-exception
branch
from
9e50282
to
8869037
Compare
DavisRayM
approved these changes
May 23, 2023
ukanga
approved these changes
May 23, 2023
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.
Changes / Features implemented
UnboundLocalErrorexception thrown for uninitializedevent_sourcevarSteps taken to verify this change does what is intended
Side effects of implementing this change
Before submitting this PR for review, please make sure you have:
Closes #2424 and #2427