Skip to content

Support for Django 1.8a1 #2441

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lovelydinosaur merged 2 commits into from
Jan 23, 2015
Merged

Support for Django 1.8a1 #2441

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
857185c
Workaround Django issue 24198.
xordoquy Jan 21, 2015
15f797f
Owned by import *
xordoquy Jan 21, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Owned by import *
  • Loading branch information
@xordoquy
xordoquy committed Jan 21, 2015
commit 15f797fd3ec61947aaecc05e6fd040e1e3e8776a
4 changes: 2 additions & 2 deletions rest_framework/serializers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"""
from __future__ import unicode_literals
from django.db import models
from django.db.models.fields import FieldDoesNotExist, Field
from django.db.models.fields import FieldDoesNotExist, Field as DjangoField
from django.utils.translation import ugettext_lazy as _
from rest_framework.compat import unicode_to_repr
from rest_framework.utils import model_meta
Expand Down Expand Up @@ -939,7 +939,7 @@ def get_fields(self):
except FieldDoesNotExist:
continue

if not isinstance(model_field, Field):
if not isinstance(model_field, DjangoField):
continue

# Include each of the `unique_for_*` field names.
Expand Down