Skip to content

Commit 15f797f

Browse files
committed
Owned by import *
1 parent 857185c commit 15f797f

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

rest_framework/serializers.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"""
1313
from __future__ import unicode_literals
1414
from django.db import models
15-
from django.db.models.fields import FieldDoesNotExist, Field
15+
from django.db.models.fields import FieldDoesNotExist, Field as DjangoField
1616
from django.utils.translation import ugettext_lazy as _
1717
from rest_framework.compat import unicode_to_repr
1818
from rest_framework.utils import model_meta
@@ -939,7 +939,7 @@ def get_fields(self):
939939
except FieldDoesNotExist:
940940
continue
941941

942-
if not isinstance(model_field, Field):
942+
if not isinstance(model_field, DjangoField):
943943
continue
944944

945945
# Include each of the `unique_for_*` field names.

0 commit comments

Comments
 (0)