Skip to content

Commit 6e0b47c

Browse files
committed
Fix failing tox
1 parent 77ac0b2 commit 6e0b47c

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

rest_framework_json_api/relations.py

+5-3
Original file line numberDiff line numberDiff line change
@@ -118,9 +118,11 @@ def get_links(self, obj=None, lookup_field='pk'):
118118

119119
"""
120120
Assuming RelatedField will be declared in two ways:
121-
1. url(r'^authors/(?P<pk>[^/.]+)/(?P<related_field>\w+)/$', AuthorViewSet.as_view({'get': 'retrieve_related'}))
122-
2. url(r'^authors/(?P<author_pk>[^/.]+)/bio/$', AuthorBioViewSet.as_view({'get': 'retrieve'}))
123-
In other words if related_link_url_kwarg == 'pk' it will add 'related_field' parameter to reverse()
121+
1. url(r'^authors/(?P<pk>[^/.]+)/(?P<related_field>\w+)/$',
122+
AuthorViewSet.as_view({'get': 'retrieve_related'}))
123+
2. url(r'^authors/(?P<author_pk>[^/.]+)/bio/$',
124+
AuthorBioViewSet.as_view({'get': 'retrieve'}))
125+
So, if related_link_url_kwarg == 'pk' it will add 'related_field' parameter to reverse()
124126
"""
125127
if self.related_link_url_kwarg == 'pk':
126128
related_kwargs = self_kwargs

rest_framework_json_api/views.py

+4-2
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,10 @@ def get_serializer_class(self):
133133
if 'related_field' in self.kwargs:
134134
field_name = self.kwargs['related_field']
135135

136-
assert hasattr(parent_serializer_class, 'included_serializers') or self.related_serializers,\
137-
'Either "included_serializers" or "related_serializers" should be configured'
136+
assert hasattr(parent_serializer_class, 'included_serializers')\
137+
or self.related_serializers,\
138+
'Either "included_serializers" or ' \
139+
'"related_serializers" should be configured'
138140

139141
# Try get the class from related_serializers
140142
class_str = self.related_serializers.get(field_name, None)

0 commit comments

Comments
 (0)