fixup! Make compatible with Python 2.X

Author: Tim Csitkovics

example/tests/test_serializers.py

@@ -5,11 +5,10 @@
 from django.urls import reverse
 from django.utils import timezone
 
+from example.models import Author, Blog, Entry
 from rest_framework_json_api.serializers import ResourceIdentifierObjectSerializer, ModelSerializer
 from rest_framework_json_api.utils import format_resource_type
 
-from example.models import Author, Blog, Entry
-
 pytestmark = pytest.mark.django_db
 
 
@@ -35,17 +34,14 @@ def setUp(self):
     def test_forward_relationship_not_loaded_when_not_included(self):
         MockRequest = namedtuple('Request', ['query_params'])
         request_without_includes = MockRequest({})
-        to_representation_was_called = False
 
         class BlogSerializer(ModelSerializer):
             class Meta:
                 model = Blog
                 fields = '__all__'
 
             def to_representation(self, instance):
-                nonlocal to_representation_was_called
-                to_representation_was_called = True
-                return super().to_representation(instance)
+                raise Exception('to_representation of BlogSerializer was called')
 
         class EntrySerializer(ModelSerializer):
             blog = BlogSerializer()
@@ -60,7 +56,6 @@ class Meta:
 
         serializer = EntrySerializer(context={'request': request_without_includes})
         serializer.to_representation(self.entry)
-        self.assertFalse(to_representation_was_called)
 
     def test_data_in_correct_format_when_instantiated_with_blog_object(self):
         serializer = ResourceIdentifierObjectSerializer(instance=self.blog)

rest_framework_json_api/serializers.py

@@ -192,7 +192,9 @@ def to_representation(self, instance):
     def _get_field_representation(self, field, instance):
         request = self.context.get('request', None)
         is_included = field.source in get_included_resources(request)
-        if not is_included and isinstance(field, ModelSerializer) and hasattr(instance, field.source + '_id'):
+        if not is_included and \
+                isinstance(field, ModelSerializer) and \
+                hasattr(instance, field.source + '_id'):
             attribute = getattr(instance, field.source + '_id')
 
             if attribute is None: