Google Analytics runner - iterate over keys the Python 3 way #4538
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
arikfr
reviewed
Jan 13, 2020
| @@ -164,7 +164,7 @@ def run_query(self, query, user): | |||
| params = json_loads(query) | |||
| except: | |||
| params = parse_qs(urlparse(query).query, keep_blank_values=True) | |||
| for key in params.keys(): | |||
| for key in [*params]: | |||
There was a problem hiding this comment.
I'm not sure this is the issue:
>>> d = {'ab': 'yesterday', 'cd': 2}
>>> for k in d.keys():
... print(k)
...
ab
cd
(this shows that the keys are iterated properly)
But, check the following:
>>> ",".join("yesterday")
'y,e,s,t,e,r,d,a,y'
So the issue is actually line 168 which applies ",".join on any value.
There was a problem hiding this comment.
The real problem is line 170, which messes around with the dict_keys iterator, something that didn't happen in Python 2. Populating a new list of keys with [*params] solves this.
arikfr
approved these changes
Jan 13, 2020
| @@ -164,7 +164,7 @@ def run_query(self, query, user): | |||
| params = json_loads(query) | |||
| except: | |||
| params = parse_qs(urlparse(query).query, keep_blank_values=True) | |||
| for key in params.keys(): | |||
| for key in [*params]: | |||
There was a problem hiding this comment.
Suggested change
| for key in [*params]: | |
| # Because we change keys list on line 170, we need to create a copy of the keys | |
| for key in [*params]: |
There was a problem hiding this comment.
Another option that would make fiddling with iterators (and the need to explain it) redundant is:
query_string = parse_qs(urlparse(query).query, keep_blank_values=True)
params = {k.replace('-', '_'): ",".join(v) for k,v in query_string.items() }We'll still have to explain ",".join, but maybe we don't have to.
| @@ -164,7 +164,7 @@ def run_query(self, query, user): | |||
| params = json_loads(query) | |||
| except: | |||
| params = parse_qs(urlparse(query).query, keep_blank_values=True) | |||
| for key in params.keys(): | |||
| for key in [*params]: | |||
| params[key] = ",".join(params[key]) | |||
There was a problem hiding this comment.
Suggested change
| params[key] = ",".join(params[key]) | |
| # parse_qs returns every value as a list | |
| params[key] = ",".join(params[key]) |
arikfr
approved these changes
Jan 13, 2020
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.
What type of PR is this? (check all applicable)
Description
Following #4181, Google Analytics queries were broken since dict
.keys()returnsdict_keys, which would in turn yield wrong results when iterating over param values, resulting in errors such asRelated Tickets & Documents
#4181