aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarlton Gibson2015-02-17 11:22:37 +0100
committerCarlton Gibson2015-02-17 11:22:37 +0100
commitdaf1d59d0f41d2ea89e0b996d22b5d4e84914fb5 (patch)
tree2072bce02b3c3d2ff6ad481f2da29813416cb915
parent4248a8d3fc725d9ae3fe7aaaad7ee12479ab07ab (diff)
downloaddjango-rest-framework-daf1d59d0f41d2ea89e0b996d22b5d4e84914fb5.tar.bz2
Adjust importlib import
-rw-r--r--rest_framework/settings.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/rest_framework/settings.py b/rest_framework/settings.py
index 7331f265..8ccfd3ed 100644
--- a/rest_framework/settings.py
+++ b/rest_framework/settings.py
@@ -20,7 +20,11 @@ back to the defaults.
from __future__ import unicode_literals
from django.test.signals import setting_changed
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