Skip to content

Commit e3522e8

Browse files
author
kazmiruk
committed
move importlib to compat
1 parent 73e433e commit e3522e8

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

rest_framework/compat.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -284,3 +284,11 @@ def python_2_unicode_compatible(klass):
284284
from django.contrib.contenttypes.fields import GenericForeignKey
285285
else:
286286
from django.contrib.contenttypes.generic import GenericForeignKey
287+
288+
"""
289+
django.utils.importlib is deprecated since django 1.8
290+
"""
291+
try:
292+
import importlib
293+
except ImportError:
294+
from django.utils import importlib

rest_framework/settings.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,7 @@
2121
from django.conf import settings
2222
from django.utils import six
2323
from rest_framework import ISO_8601
24-
25-
try:
26-
import importlib
27-
except ImportError:
28-
from django.utils import importlib
24+
from rest_framework.compat import importlib
2925

3026

3127
USER_SETTINGS = getattr(settings, 'REST_FRAMEWORK', None)

0 commit comments

Comments
 (0)