Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit e1feedc

Browse files
authored
Clean up python2 related code crafts (#974)
1 parent 50841f7 commit e1feedc

File tree

6 files changed

+27
-36
lines changed

6 files changed

+27
-36
lines changed

‎AUTHORS‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ Adam Wróbel <https://adamwrobel.com>
22
Adam Ziolkowski <adam@adsized.com>
33
Alan Crosswell <alan@columbia.edu>
44
Anton Shutik <shutikanton@gmail.com>
5+
Asif Saif Uddin <auvipy@gmail.com>
56
Beni Keller <beni@matraxi.ch>
67
Boris Pleshakov <koordinator.kun@gmail.com>
78
Charlie Allatson <charles.allatson@gmail.com>

‎rest_framework_json_api/relations.py‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,14 @@
2929
]
3030

3131

32-
class SkipDataMixin(object):
32+
class SkipDataMixin:
3333
"""
3434
This workaround skips "data" rendering for relationships
3535
in order to save some sql queries and improve performance
3636
"""
3737

3838
def __init__(self, *args, **kwargs):
39-
super(SkipDataMixin, self).__init__(*args, **kwargs)
39+
super().__init__(*args, **kwargs)
4040

4141
def get_attribute(self, instance):
4242
raise SkipField
@@ -49,7 +49,7 @@ class ManyRelatedFieldWithNoData(SkipDataMixin, DRFManyRelatedField):
4949
pass
5050

5151

52-
class HyperlinkedMixin(object):
52+
class HyperlinkedMixin:
5353
self_link_view_name = None
5454
related_link_view_name = None
5555
related_link_lookup_field = "pk"
@@ -72,7 +72,7 @@ def __init__(self, self_link_view_name=None, related_link_view_name=None, **kwar
7272
# implicit `self` argument to be passed.
7373
self.reverse = reverse
7474

75-
super(HyperlinkedMixin, self).__init__(**kwargs)
75+
super().__init__(**kwargs)
7676

7777
def get_url(self, name, view_name, kwargs, request):
7878
"""
@@ -197,7 +197,7 @@ def __init__(self, **kwargs):
197197
if model:
198198
self.model = model
199199

200-
super(ResourceRelatedField, self).__init__(**kwargs)
200+
super().__init__(**kwargs)
201201

202202
def use_pk_only_optimization(self):
203203
# We need the real object to determine its type...
@@ -245,7 +245,7 @@ def to_internal_value(self, data):
245245
received_type=data["type"],
246246
)
247247

248-
return super(ResourceRelatedField, self).to_internal_value(data["id"])
248+
return super().to_internal_value(data["id"])
249249

250250
def to_representation(self, value):
251251
if getattr(self, "pk_field", None) is not None:
@@ -329,7 +329,7 @@ class PolymorphicResourceRelatedField(ResourceRelatedField):
329329

330330
def __init__(self, polymorphic_serializer, *args, **kwargs):
331331
self.polymorphic_serializer = polymorphic_serializer
332-
super(PolymorphicResourceRelatedField, self).__init__(*args, **kwargs)
332+
super().__init__(*args, **kwargs)
333333

334334
def use_pk_only_optimization(self):
335335
return False

‎rest_framework_json_api/renderers.py‎

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -495,12 +495,10 @@ def render_relationship_view(
495495
links = view.get_links()
496496
if links:
497497
render_data.update({"links": links}),
498-
return super(JSONRenderer, self).render(
499-
render_data, accepted_media_type, renderer_context
500-
)
498+
return super().render(render_data, accepted_media_type, renderer_context)
501499

502500
def render_errors(self, data, accepted_media_type=None, renderer_context=None):
503-
return super(JSONRenderer, self).render(
501+
return super().render(
504502
utils.format_errors(data), accepted_media_type, renderer_context
505503
)
506504

@@ -522,9 +520,7 @@ def render(self, data, accepted_media_type=None, renderer_context=None):
522520
# be None
523521
response = renderer_context.get("response", None)
524522
if response is not None and response.status_code == 204:
525-
return super(JSONRenderer, self).render(
526-
None, accepted_media_type, renderer_context
527-
)
523+
return super().render(None, accepted_media_type, renderer_context)
528524

529525
from rest_framework_json_api.views import RelationshipView
530526

@@ -536,9 +532,7 @@ def render(self, data, accepted_media_type=None, renderer_context=None):
536532
# If `resource_name` is set to None then render default as the dev
537533
# wants to build the output format manually.
538534
if resource_name is None or resource_name is False:
539-
return super(JSONRenderer, self).render(
540-
data, accepted_media_type, renderer_context
541-
)
535+
return super().render(data, accepted_media_type, renderer_context)
542536

543537
json_api_data = data
544538
# initialize json_api_meta with pagination meta or an empty dict
@@ -664,9 +658,7 @@ def render(self, data, accepted_media_type=None, renderer_context=None):
664658
if json_api_meta:
665659
render_data["meta"] = utils.format_field_names(json_api_meta)
666660

667-
return super(JSONRenderer, self).render(
668-
render_data, accepted_media_type, renderer_context
669-
)
661+
return super().render(render_data, accepted_media_type, renderer_context)
670662

671663

672664
class BrowsableAPIRenderer(renderers.BrowsableAPIRenderer):

‎rest_framework_json_api/serializers.py‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ def __init__(self, *args, **kwargs):
4545
self.model_class = kwargs.pop("model_class", self.model_class)
4646
# this has no fields but assumptions are made elsewhere that self.fields exists.
4747
self.fields = {}
48-
super(ResourceIdentifierObjectSerializer, self).__init__(*args, **kwargs)
48+
super().__init__(*args, **kwargs)
4949

5050
def to_representation(self, instance):
5151
return {
@@ -69,15 +69,15 @@ def to_internal_value(self, data):
6969
self.fail("incorrect_type", data_type=type(data["pk"]).__name__)
7070

7171

72-
class SparseFieldsetsMixin(object):
72+
class SparseFieldsetsMixin:
7373
"""
7474
A serializer mixin that adds support for sparse fieldsets through `fields` query parameter.
7575
7676
Specification: https://jsonapi.org/format/#fetching-sparse-fieldsets
7777
"""
7878

7979
def __init__(self, *args, **kwargs):
80-
super(SparseFieldsetsMixin, self).__init__(*args, **kwargs)
80+
super().__init__(*args, **kwargs)
8181
context = kwargs.get("context")
8282
request = context.get("request") if context else None
8383

@@ -107,7 +107,7 @@ def __init__(self, *args, **kwargs):
107107
self.fields.pop(field_name)
108108

109109

110-
class IncludedResourcesValidationMixin(object):
110+
class IncludedResourcesValidationMixin:
111111
"""
112112
A serializer mixin that adds validation of `include` query parameter to
113113
support compound documents.
@@ -150,7 +150,7 @@ def validate_path(serializer_class, field_path, path):
150150
this_serializer_class, included_field_path, included_field_name
151151
)
152152

153-
super(IncludedResourcesValidationMixin, self).__init__(*args, **kwargs)
153+
super().__init__(*args, **kwargs)
154154

155155

156156
class LazySerializersDict(Mapping):
@@ -302,9 +302,7 @@ class PolymorphicSerializerMetaclass(SerializerMetaclass):
302302
"""
303303

304304
def __new__(cls, name, bases, attrs):
305-
new_class = super(PolymorphicSerializerMetaclass, cls).__new__(
306-
cls, name, bases, attrs
307-
)
305+
new_class = super().__new__(cls, name, bases, attrs)
308306

309307
# Ensure initialization is only performed for subclasses of PolymorphicModelSerializer
310308
# (excluding PolymorphicModelSerializer class itself).
@@ -363,7 +361,7 @@ def get_fields(self):
363361
raise Exception(
364362
"Cannot get fields from a polymorphic serializer given a queryset"
365363
)
366-
return super(PolymorphicModelSerializer, self).get_fields()
364+
return super().get_fields()
367365

368366
@classmethod
369367
def get_polymorphic_serializer_for_instance(cls, instance):

‎rest_framework_json_api/settings.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
}
1919

2020

21-
class JSONAPISettings(object):
21+
class JSONAPISettings:
2222
"""
2323
A settings object that allows JSON:API settings to be access as
2424
properties.

‎rest_framework_json_api/views.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
)
3131

3232

33-
class PreloadIncludesMixin(object):
33+
class PreloadIncludesMixin:
3434
"""
3535
This mixin provides a helper attributes to select or prefetch related models
3636
based on the include specified in the URL.
@@ -60,7 +60,7 @@ def get_prefetch_related(self, include):
6060
return getattr(self, "prefetch_for_includes", {}).get(include, None)
6161

6262
def get_queryset(self, *args, **kwargs):
63-
qs = super(PreloadIncludesMixin, self).get_queryset(*args, **kwargs)
63+
qs = super().get_queryset(*args, **kwargs)
6464

6565
included_resources = get_included_resources(
6666
self.request, self.get_serializer_class()
@@ -78,10 +78,10 @@ def get_queryset(self, *args, **kwargs):
7878
return qs
7979

8080

81-
class AutoPrefetchMixin(object):
81+
class AutoPrefetchMixin:
8282
def get_queryset(self, *args, **kwargs):
8383
"""This mixin adds automatic prefetching for OneToOne and ManyToMany fields."""
84-
qs = super(AutoPrefetchMixin, self).get_queryset(*args, **kwargs)
84+
qs = super().get_queryset(*args, **kwargs)
8585

8686
included_resources = get_included_resources(
8787
self.request, self.get_serializer_class()
@@ -127,7 +127,7 @@ def get_queryset(self, *args, **kwargs):
127127
return qs
128128

129129

130-
class RelatedMixin(object):
130+
class RelatedMixin:
131131
"""
132132
This mixin handles all related entities, whose Serializers are declared in "related_serializers"
133133
"""
@@ -239,7 +239,7 @@ def get_serializer_class(self):
239239
return self.serializer_class
240240

241241
def __init__(self, **kwargs):
242-
super(RelationshipView, self).__init__(**kwargs)
242+
super().__init__(**kwargs)
243243
# We include this simply for dependency injection in tests.
244244
# We can't add it as a class attributes or it would expect an
245245
# implicit `self` argument to be passed.

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /