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
76fe710c
Commit
76fe710c
authored
Feb 17, 2015
by
Tom Christie
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #2565 from carltongibson/18-warning
Adjust importlib import
parents
4248a8d3
daf1d59d
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
1 deletions
+5
-1
rest_framework/settings.py
+5
-1
No files found.
rest_framework/settings.py
View file @
76fe710c
...
@@ -20,7 +20,11 @@ back to the defaults.
...
@@ -20,7 +20,11 @@ back to the defaults.
from
__future__
import
unicode_literals
from
__future__
import
unicode_literals
from
django.test.signals
import
setting_changed
from
django.test.signals
import
setting_changed
from
django.conf
import
settings
from
django.conf
import
settings
from
django.utils
import
importlib
,
six
try
:
import
importlib
except
ImportError
:
from
django.utils
import
importlib
from
django.utils
import
six
from
rest_framework
import
ISO_8601
from
rest_framework
import
ISO_8601
...
...
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