Commit 76fe710c by Tom Christie

Merge pull request #2565 from carltongibson/18-warning

Adjust importlib import
parents 4248a8d3 daf1d59d
...@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment