encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-01-24 00:04:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2565 from carltongibson/18-warning

Browse Source 
Adjust importlib import
This commit is contained in:
Tom Christie 2015-02-17 10:25:56 +00:00
commit 76fe710c0d
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rest_framework/settings.py
View File

@ -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