Move importlib fallback into compat.

This commit is contained in:
Carlton Gibson 2015-02-17 11:55:15 +01:00
parent daf1d59d0f
commit c5eb5b2201
2 changed files with 5 additions and 6 deletions

View File

@ -12,7 +12,10 @@ from django.utils.six.moves.urllib.parse import urlparse as _urlparse
from django.utils import six from django.utils import six
import django import django
import inspect import inspect
try:
import importlib
except ImportError:
from django.utils import importlib
def unicode_repr(instance): def unicode_repr(instance):
# Get the repr of an instance, but ensure it is a unicode string # Get the repr of an instance, but ensure it is a unicode string

View File

@ -20,13 +20,9 @@ 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
try:
import importlib
except ImportError:
from django.utils import importlib
from django.utils import six from django.utils import six
from rest_framework import ISO_8601 from rest_framework import ISO_8601
from rest_framework.compat import importlib
USER_SETTINGS = getattr(settings, 'REST_FRAMEWORK', None) USER_SETTINGS = getattr(settings, 'REST_FRAMEWORK', None)