Commit e3522e8a by kazmiruk

move importlib to compat

parent 73e433ed
...@@ -284,3 +284,11 @@ if django.VERSION >= (1, 8): ...@@ -284,3 +284,11 @@ if django.VERSION >= (1, 8):
from django.contrib.contenttypes.fields import GenericForeignKey from django.contrib.contenttypes.fields import GenericForeignKey
else: else:
from django.contrib.contenttypes.generic import GenericForeignKey from django.contrib.contenttypes.generic import GenericForeignKey
"""
django.utils.importlib is deprecated since django 1.8
"""
try:
import importlib
except ImportError:
from django.utils import importlib
...@@ -21,11 +21,7 @@ from __future__ import unicode_literals ...@@ -21,11 +21,7 @@ from __future__ import unicode_literals
from django.conf import settings from django.conf import settings
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
try:
import importlib
except ImportError:
from django.utils import importlib
USER_SETTINGS = getattr(settings, 'REST_FRAMEWORK', None) USER_SETTINGS = getattr(settings, 'REST_FRAMEWORK', None)
......
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