Skip to content

fix(py3): Various more iter -> list cohersions #20205

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
evanpurkhiser merged 3 commits into from
Aug 14, 2020
Merged

fix(py3): Various more iter -> list cohersions #20205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d1ee127
fix(py3): Various more iter -> list cohersions
evanpurkhiser Aug 12, 2020
6f0ae4d
Update tests/snuba/tasks/test_unmerge.py
evanpurkhiser Aug 13, 2020
afdad7e
Update tests/snuba/tasks/test_unmerge.py
evanpurkhiser Aug 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/sentry/api/serializers/models/rule.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,11 @@ def serialize(self, obj, attrs, user):
# as part of the rule editor
"id": six.text_type(obj.id) if obj.id else None,
"conditions": [
dict(o.items() + [("name", _generate_rule_label(obj.project, obj, o))])
dict(list(o.items()) + [("name", _generate_rule_label(obj.project, obj, o))])
Copy link
Member

@BYK BYK Aug 13, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

itertools.chain() might be cheaper here.

for o in obj.data.get("conditions", [])
],
"actions": [
dict(o.items() + [("name", _generate_rule_label(obj.project, obj, o))])
dict(list(o.items()) + [("name", _generate_rule_label(obj.project, obj, o))])
for o in obj.data.get("actions", [])
],
"actionMatch": obj.data.get("action_match") or Rule.DEFAULT_CONDITION_MATCH,
Expand Down
2 changes: 1 addition & 1 deletion src/sentry/tagstore/snuba/backend.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -543,7 +543,7 @@ def __get_release(self, project_id, group_id, first=True):
if not result:
return None
else:
return result.keys()[0]
return list(result.keys())[0]

def get_first_release(self, project_id, group_id):
return self.__get_release(project_id, group_id, True)
Expand Down
2 changes: 1 addition & 1 deletion tests/sentry/data_export/test_models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ def test_status_property(self):

def test_payload_property(self):
assert isinstance(self.data_export.payload, dict)
keys = self.data_export.query_info.keys() + ["export_type"]
keys = list(self.data_export.query_info.keys()) + ["export_type"]
assert sorted(self.data_export.payload.keys()) == sorted(keys)

def test_file_name_property(self):
Expand Down
6 changes: 3 additions & 3 deletions tests/snuba/tasks/test_unmerge.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ def create_message_event(template, parameters, environment, release, fingerprint

with self.tasks():
eventstream_state = eventstream.start_unmerge(
project.id, [events.keys()[0]], source.id, destination.id
project.id, [list(events.keys())[0]], source.id, destination.id
)
unmerge.delay(
project.id, source.id, destination.id, [events.keys()[0]], None, batch_size=5
Expand Down Expand Up @@ -320,7 +320,7 @@ def create_message_event(template, parameters, environment, release, fingerprint

assert set(
GroupHash.objects.filter(group_id=source.id).values_list("hash", flat=True)
) == set([events.keys()[0], events.keys()[1]])
) == set(itertools.islice(events.keys(), 2))

assert set(
GroupRelease.objects.filter(group_id=source.id).values_list(
Expand All @@ -347,7 +347,7 @@ def create_message_event(template, parameters, environment, release, fingerprint

assert set(
GroupHash.objects.filter(group_id=destination.id).values_list("hash", flat=True)
) == set([events.keys()[2]])
) == set(itertools.islice(events.keys(), 2, 3))

assert set(
GroupRelease.objects.filter(group_id=destination.id).values_list(
Expand Down
4 changes: 2 additions & 2 deletions tests/snuba/tsdb/test_tsdb_backend.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ def has_shape(data, shape, allow_empty=False):
if isinstance(data, dict):
return (
(allow_empty or len(data) > 0)
and all(has_shape(k, shape.keys()[0]) for k in data.keys())
and all(has_shape(v, shape.values()[0]) for v in data.values())
and all(has_shape(k, list(shape.keys())[0]) for k in data.keys())
and all(has_shape(v, list(shape.values())[0]) for v in data.values())
)
elif isinstance(data, list):
return (allow_empty or len(data) > 0) and all(has_shape(v, shape[0]) for v in data)
Expand Down