Skip to content

Commit 65f9b15

Browse files
author
Boris Pleshakov
committed
f pep
1 parent ab9a1ae commit 65f9b15

File tree

3 files changed

+6
-7
lines changed

3 files changed

+6
-7
lines changed

rest_framework_json_api/renderers.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
from rest_framework.relations import PKOnlyObject
1414
from rest_framework.serializers import BaseSerializer, ListSerializer, Serializer
1515
from rest_framework.settings import api_settings
16-
from .settings import json_api_settings, RELATIONS_RENDERING_STRATEGY, ATTRIBUTE_RENDERING_STRATEGY
16+
from .settings import json_api_settings
1717

1818
import rest_framework_json_api
1919
from rest_framework_json_api import utils

rest_framework_json_api/serializers.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
get_resource_type_from_serializer
1616
)
1717

18-
from rest_framework_json_api.settings import json_api_settings, RELATIONS_RENDERING_STRATEGY
18+
from rest_framework_json_api.settings import json_api_settings
1919

2020

2121
class ResourceIdentifierObjectSerializer(BaseSerializer):

rest_framework_json_api/settings.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@
1010

1111
JSON_API_SETTINGS_PREFIX = 'JSON_API_'
1212

13-
RELATIONS_RENDERING_STRATEGY = 'RELATIONS'
14-
ATTRIBUTE_RENDERING_STRATEGY = 'ATTRIBUTE'
15-
1613
DEFAULTS = {
1714
'FORMAT_FIELD_NAMES': False,
1815
'FORMAT_TYPES': False,
@@ -32,12 +29,14 @@ def __init__(self, user_settings=settings, defaults=DEFAULTS):
3229
self.defaults = defaults
3330
self.user_settings = user_settings
3431

32+
field_name = JSON_API_SETTINGS_PREFIX + 'SERIALIZE_NESTED_SERIALIZERS_AS_ATTRIBUTE'
33+
3534
value = getattr(
3635
self.user_settings,
37-
JSON_API_SETTINGS_PREFIX + 'SERIALIZE_NESTED_SERIALIZERS_AS_ATTRIBUTE',
36+
field_name,
3837
self.defaults['SERIALIZE_NESTED_SERIALIZERS_AS_ATTRIBUTE'])
3938

40-
if not value and not hasattr(self.user_settings, JSON_API_SETTINGS_PREFIX + 'SERIALIZE_NESTED_SERIALIZERS_AS_ATTRIBUTE'):
39+
if not value and not hasattr(self.user_settings, field_name):
4140
warnings.warn(DeprecationWarning(
4241
"Rendering nested serializers in relations by default is deprecated and will be "
4342
"changed in future releases. Please, use ResourceRelatedField or set "

0 commit comments

Comments
 (0)