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
e3522e8a
Commit
e3522e8a
authored
Apr 24, 2015
by
kazmiruk
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
move importlib to compat
parent
73e433ed
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
5 deletions
+9
-5
rest_framework/compat.py
+8
-0
rest_framework/settings.py
+1
-5
No files found.
rest_framework/compat.py
View file @
e3522e8a
...
@@ -284,3 +284,11 @@ if django.VERSION >= (1, 8):
...
@@ -284,3 +284,11 @@ if django.VERSION >= (1, 8):
from
django.contrib.contenttypes.fields
import
GenericForeignKey
from
django.contrib.contenttypes.fields
import
GenericForeignKey
else
:
else
:
from
django.contrib.contenttypes.generic
import
GenericForeignKey
from
django.contrib.contenttypes.generic
import
GenericForeignKey
"""
django.utils.importlib is deprecated since django 1.8
"""
try
:
import
importlib
except
ImportError
:
from
django.utils
import
importlib
rest_framework/settings.py
View file @
e3522e8a
...
@@ -21,11 +21,7 @@ from __future__ import unicode_literals
...
@@ -21,11 +21,7 @@ from __future__ import unicode_literals
from
django.conf
import
settings
from
django.conf
import
settings
from
django.utils
import
six
from
django.utils
import
six
from
rest_framework
import
ISO_8601
from
rest_framework
import
ISO_8601
from
rest_framework.compat
import
importlib
try
:
import
importlib
except
ImportError
:
from
django.utils
import
importlib
USER_SETTINGS
=
getattr
(
settings
,
'REST_FRAMEWORK'
,
None
)
USER_SETTINGS
=
getattr
(
settings
,
'REST_FRAMEWORK'
,
None
)
...
...
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