Skip to content

Commit 6b632c1

Browse files
authored
Remove unnecessary type conversions (#7526)
1 parent ddcd8b5 commit 6b632c1

File tree

4 files changed

+8
-12
lines changed

4 files changed

+8
-12
lines changed

rest_framework/pagination.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ def _get_displayed_page_numbers(current, final):
8080

8181
# Now sort the page numbers and drop anything outside the limits.
8282
included = [
83-
idx for idx in sorted(list(included))
83+
idx for idx in sorted(included)
8484
if 0 < idx <= final
8585
]
8686

rest_framework/renderers.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@ def render_field(self, field, parent_style):
329329
if isinstance(field._field, serializers.HiddenField):
330330
return ''
331331

332-
style = dict(self.default_style[field])
332+
style = self.default_style[field].copy()
333333
style.update(field.style)
334334
if 'template_pack' not in style:
335335
style['template_pack'] = parent_style.get('template_pack', self.template_pack)

rest_framework/serializers.py

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -194,10 +194,7 @@ def save(self, **kwargs):
194194
"inspect 'serializer.validated_data' instead. "
195195
)
196196

197-
validated_data = dict(
198-
list(self.validated_data.items()) +
199-
list(kwargs.items())
200-
)
197+
validated_data = {**self.validated_data, **kwargs}
201198

202199
if self.instance is not None:
203200
self.instance = self.update(self.instance, validated_data)
@@ -699,8 +696,7 @@ def save(self, **kwargs):
699696
)
700697

701698
validated_data = [
702-
dict(list(attrs.items()) + list(kwargs.items()))
703-
for attrs in self.validated_data
699+
{**attrs, **kwargs} for attrs in self.validated_data
704700
]
705701

706702
if self.instance is not None:
@@ -1410,7 +1406,7 @@ def get_uniqueness_extra_kwargs(self, field_names, declared_fields, extra_kwargs
14101406
# so long as all the field names are included on the serializer.
14111407
for parent_class in [model] + list(model._meta.parents):
14121408
for unique_together_list in parent_class._meta.unique_together:
1413-
if set(field_names).issuperset(set(unique_together_list)):
1409+
if set(field_names).issuperset(unique_together_list):
14141410
unique_constraint_names |= set(unique_together_list)
14151411

14161412
# Now we have all the field names that have uniqueness constraints
@@ -1541,7 +1537,7 @@ def get_unique_together_validators(self):
15411537
for parent_class in model_class_inheritance_tree:
15421538
for unique_together in parent_class._meta.unique_together:
15431539
# Skip if serializer does not map to all unique together sources
1544-
if not set(source_map).issuperset(set(unique_together)):
1540+
if not set(source_map).issuperset(unique_together):
15451541
continue
15461542

15471543
for source in unique_together:

rest_framework/utils/urls.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ def replace_query_param(url, key, val):
1111
(scheme, netloc, path, query, fragment) = parse.urlsplit(force_str(url))
1212
query_dict = parse.parse_qs(query, keep_blank_values=True)
1313
query_dict[force_str(key)] = [force_str(val)]
14-
query = parse.urlencode(sorted(list(query_dict.items())), doseq=True)
14+
query = parse.urlencode(sorted(query_dict.items()), doseq=True)
1515
return parse.urlunsplit((scheme, netloc, path, query, fragment))
1616

1717

@@ -23,5 +23,5 @@ def remove_query_param(url, key):
2323
(scheme, netloc, path, query, fragment) = parse.urlsplit(force_str(url))
2424
query_dict = parse.parse_qs(query, keep_blank_values=True)
2525
query_dict.pop(key, None)
26-
query = parse.urlencode(sorted(list(query_dict.items())), doseq=True)
26+
query = parse.urlencode(sorted(query_dict.items()), doseq=True)
2727
return parse.urlunsplit((scheme, netloc, path, query, fragment))

0 commit comments

Comments
 (0)