encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-06-29 01:43:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

move importlib to compat

Browse Source
This commit is contained in:
kazmiruk 2015-04-24 22:58:14 +07:00
parent 73e433ed5c
commit e3522e8aef
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
rest_framework/compat.py
View File

@ -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

6
rest_framework/settings.py
View File

@ -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)