From 1c437a793c3f3cedb1aa53f0cccec23a96cc3f34 Mon Sep 17 00:00:00 2001 From: Mariusz Felisiak Date: Sun, 29 Jan 2017 20:38:39 +0100 Subject: [PATCH] Removed unnecessary importlib wrapper. --- rest_framework/compat.py | 5 ----- rest_framework/settings.py | 4 ++-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/rest_framework/compat.py b/rest_framework/compat.py index b0e076203..872441abc 100644 --- a/rest_framework/compat.py +++ b/rest_framework/compat.py @@ -17,11 +17,6 @@ from django.template import Context, RequestContext, Template from django.utils import six from django.views.generic import View -try: - import importlib # Available in Python 3.1+ -except ImportError: - from django.utils import importlib # Will be removed in Django 1.9 - try: from django.urls import ( diff --git a/rest_framework/settings.py b/rest_framework/settings.py index 6d9ed2355..b699d7caf 100644 --- a/rest_framework/settings.py +++ b/rest_framework/settings.py @@ -18,13 +18,13 @@ REST framework settings, checking for user settings first, then falling back to the defaults. """ from __future__ import unicode_literals +from importlib import import_module from django.conf import settings from django.test.signals import setting_changed from django.utils import six from rest_framework import ISO_8601 -from rest_framework.compat import importlib DEFAULTS = { # Base API policies @@ -174,7 +174,7 @@ def import_from_string(val, setting_name): # Nod to tastypie's use of importlib. parts = val.split('.') module_path, class_name = '.'.join(parts[:-1]), parts[-1] - module = importlib.import_module(module_path) + module = import_module(module_path) return getattr(module, class_name) except (ImportError, AttributeError) as e: msg = "Could not import '%s' for API setting '%s'. %s: %s." % (val, setting_name, e.__class__.__name__, e)