aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework
diff options
context:
space:
mode:
Diffstat (limited to 'rest_framework')
-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