Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
django-rest-framework
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
django-rest-framework
Commits
1116a534
Commit
1116a534
authored
Apr 22, 2015
by
kazmiruk
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add compatibility for django 1.6
parent
b3e03cd8
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
1 deletions
+6
-1
rest_framework/serializers.py
+6
-1
No files found.
rest_framework/serializers.py
View file @
1116a534
...
...
@@ -16,7 +16,7 @@ import datetime
import
inspect
import
types
from
decimal
import
Decimal
from
django.contrib.contenttypes.fields
import
GenericForeignKey
import
django
from
django.core.paginator
import
Page
from
django.db
import
models
from
django.forms
import
widgets
...
...
@@ -41,6 +41,11 @@ try:
except
ImportError
:
from
django.utils.datastructures
import
SortedDict
as
OrderedDict
if
django
.
VERSION
>=
(
1
,
8
):
from
django.contrib.contenttypes.fields
import
GenericForeignKey
else
:
from
django.contrib.contenttypes.generic
import
GenericForeignKey
def
_resolve_model
(
obj
):
"""
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment