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
68c88e18
Commit
68c88e18
authored
Sep 22, 2015
by
Carlton Gibson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove ContentType import fallback
parent
5c0dffa4
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
11 deletions
+3
-11
rest_framework/compat.py
+0
-10
tests/test_relations_generic.py
+3
-1
No files found.
rest_framework/compat.py
View file @
68c88e18
...
...
@@ -90,16 +90,6 @@ except ImportError:
from
django.db.models
import
get_model
# Import path changes from 1.7 onwards.
try
:
from
django.contrib.contenttypes.fields
import
(
GenericForeignKey
,
GenericRelation
)
except
ImportError
:
from
django.contrib.contenttypes.generic
import
(
GenericForeignKey
,
GenericRelation
)
# django-filter is optional
try
:
import
django_filters
...
...
tests/test_relations_generic.py
View file @
68c88e18
from
__future__
import
unicode_literals
from
django.contrib.contenttypes.fields
import
(
GenericForeignKey
,
GenericRelation
)
from
django.contrib.contenttypes.models
import
ContentType
from
django.db
import
models
from
django.test
import
TestCase
from
django.utils.encoding
import
python_2_unicode_compatible
from
rest_framework
import
serializers
from
rest_framework.compat
import
GenericForeignKey
,
GenericRelation
@python_2_unicode_compatible
...
...
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