diff options
| author | Carlton Gibson | 2015-02-17 11:55:15 +0100 | 
|---|---|---|
| committer | Carlton Gibson | 2015-02-17 11:55:15 +0100 | 
| commit | c5eb5b22018e55bffe080bb3f14e34ab6b493073 (patch) | |
| tree | 76a17d67ca9bec4d99e57d5c6540500a32beb3d3 /rest_framework | |
| parent | daf1d59d0f41d2ea89e0b996d22b5d4e84914fb5 (diff) | |
| download | django-rest-framework-c5eb5b22018e55bffe080bb3f14e34ab6b493073.tar.bz2 | |
Move `importlib` fallback into compat.
Diffstat (limited to 'rest_framework')
| -rw-r--r-- | rest_framework/compat.py | 5 | ||||
| -rw-r--r-- | rest_framework/settings.py | 6 | 
2 files changed, 5 insertions, 6 deletions
| diff --git a/rest_framework/compat.py b/rest_framework/compat.py index 50f37014..c6a4a869 100644 --- a/rest_framework/compat.py +++ b/rest_framework/compat.py @@ -12,7 +12,10 @@ from django.utils.six.moves.urllib.parse import urlparse as _urlparse  from django.utils import six  import django  import inspect - +try: +    import importlib +except ImportError: +    from django.utils import importlib  def unicode_repr(instance):      # Get the repr of an instance, but ensure it is a unicode string diff --git a/rest_framework/settings.py b/rest_framework/settings.py index 8ccfd3ed..394b1262 100644 --- a/rest_framework/settings.py +++ b/rest_framework/settings.py @@ -20,13 +20,9 @@ back to the defaults.  from __future__ import unicode_literals  from django.test.signals import setting_changed  from django.conf import settings -try: -    import importlib -except ImportError: -    from django.utils import importlib  from django.utils import six  from rest_framework import ISO_8601 - +from rest_framework.compat import importlib  USER_SETTINGS = getattr(settings, 'REST_FRAMEWORK', None) | 
