encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-11-22 01:26:53 +03:00
Code Issues Packages Projects Releases Wiki Activity

Remove unnecessary type conversions (#7526)

Browse Source
This commit is contained in:
Francisco Couzo 2020-09-08 11:42:01 -03:00 committed by GitHub
parent ddcd8b539b
commit 6b632c15b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rest_framework/pagination.py
View File

@ -80,7 +80,7 @@ def _get_displayed_page_numbers(current, final):
# Now sort the page numbers and drop anything outside the limits. # Now sort the page numbers and drop anything outside the limits.
included = [ included = [
idx for idx in sorted(list(included)) idx for idx in sorted(included)
if 0 < idx <= final if 0 < idx <= final
] ]

2
rest_framework/renderers.py
View File

@ -329,7 +329,7 @@ class HTMLFormRenderer(BaseRenderer):
if isinstance(field._field, serializers.HiddenField): if isinstance(field._field, serializers.HiddenField):
return '' return ''
style = dict(self.default_style[field]) style = self.default_style[field].copy()
style.update(field.style) style.update(field.style)
if 'template_pack' not in style: if 'template_pack' not in style:
style['template_pack'] = parent_style.get('template_pack', self.template_pack) style['template_pack'] = parent_style.get('template_pack', self.template_pack)

12
rest_framework/serializers.py
View File

@ -194,10 +194,7 @@ class BaseSerializer(Field):
"inspect 'serializer.validated_data' instead. " "inspect 'serializer.validated_data' instead. "
) )
validated_data = dict( validated_data = {**self.validated_data, **kwargs}
list(self.validated_data.items()) +
list(kwargs.items())
)
if self.instance is not None: if self.instance is not None:
self.instance = self.update(self.instance, validated_data) self.instance = self.update(self.instance, validated_data)
@ -699,8 +696,7 @@ class ListSerializer(BaseSerializer):
) )
validated_data = [ validated_data = [
dict(list(attrs.items()) + list(kwargs.items())) {**attrs, **kwargs} for attrs in self.validated_data
for attrs in self.validated_data
] ]
if self.instance is not None: if self.instance is not None:
@ -1410,7 +1406,7 @@ class ModelSerializer(Serializer):
# so long as all the field names are included on the serializer. # so long as all the field names are included on the serializer.
for parent_class in [model] + list(model._meta.parents): for parent_class in [model] + list(model._meta.parents):
for unique_together_list in parent_class._meta.unique_together: for unique_together_list in parent_class._meta.unique_together:
if set(field_names).issuperset(set(unique_together_list)): if set(field_names).issuperset(unique_together_list):
unique_constraint_names |= set(unique_together_list) unique_constraint_names |= set(unique_together_list)
# Now we have all the field names that have uniqueness constraints # Now we have all the field names that have uniqueness constraints
@ -1541,7 +1537,7 @@ class ModelSerializer(Serializer):
for parent_class in model_class_inheritance_tree: for parent_class in model_class_inheritance_tree:
for unique_together in parent_class._meta.unique_together: for unique_together in parent_class._meta.unique_together:
# Skip if serializer does not map to all unique together sources # Skip if serializer does not map to all unique together sources
if not set(source_map).issuperset(set(unique_together)): if not set(source_map).issuperset(unique_together):
continue continue
for source in unique_together: for source in unique_together:

4
rest_framework/utils/urls.py
View File

@ -11,7 +11,7 @@ def replace_query_param(url, key, val):
(scheme, netloc, path, query, fragment) = parse.urlsplit(force_str(url)) (scheme, netloc, path, query, fragment) = parse.urlsplit(force_str(url))
query_dict = parse.parse_qs(query, keep_blank_values=True) query_dict = parse.parse_qs(query, keep_blank_values=True)
query_dict[force_str(key)] = [force_str(val)] query_dict[force_str(key)] = [force_str(val)]
query = parse.urlencode(sorted(list(query_dict.items())), doseq=True) query = parse.urlencode(sorted(query_dict.items()), doseq=True)
return parse.urlunsplit((scheme, netloc, path, query, fragment)) return parse.urlunsplit((scheme, netloc, path, query, fragment))
@ -23,5 +23,5 @@ def remove_query_param(url, key):
(scheme, netloc, path, query, fragment) = parse.urlsplit(force_str(url)) (scheme, netloc, path, query, fragment) = parse.urlsplit(force_str(url))
query_dict = parse.parse_qs(query, keep_blank_values=True) query_dict = parse.parse_qs(query, keep_blank_values=True)
query_dict.pop(key, None) query_dict.pop(key, None)
query = parse.urlencode(sorted(list(query_dict.items())), doseq=True) query = parse.urlencode(sorted(query_dict.items()), doseq=True)
return parse.urlunsplit((scheme, netloc, path, query, fragment)) return parse.urlunsplit((scheme, netloc, path, query, fragment))