Merge pull request #20113 from edx/INCR-187

INCR-187

openedx/core/djangoapps/api_admin/admin.py

@@ -1,5 +1,6 @@
 """Admin views for API managment."""
 from __future__ import absolute_import
+
 from config_models.admin import ConfigurationModelAdmin
 from django.contrib import admin
 from django.urls import reverse

openedx/core/djangoapps/api_admin/decorators.py

@@ -1,9 +1,11 @@
 """Decorators for API access management."""
+from __future__ import absolute_import
+
 from functools import wraps
 
-from django.urls import reverse
 from django.http import HttpResponseNotFound
 from django.shortcuts import redirect
+from django.urls import reverse
 
 from openedx.core.djangoapps.api_admin.models import ApiAccessConfig, ApiAccessRequest
 

openedx/core/djangoapps/api_admin/forms.py

@@ -1,4 +1,6 @@
 """Forms for API management."""
+from __future__ import absolute_import
+
 from django import forms
 from django.contrib.auth.models import User
 from django.utils.translation import ugettext as _

openedx/core/djangoapps/api_admin/models.py

@@ -1,21 +1,23 @@
 """Models for API management."""
+from __future__ import absolute_import
+
 import logging
 from smtplib import SMTPException
-from urlparse import urlunsplit
 
 from config_models.models import ConfigurationModel
 from django.conf import settings
 from django.contrib.auth.models import User
 from django.contrib.sites.models import Site
 from django.core.mail import send_mail
-from django.urls import reverse
 from django.db import models
 from django.db.models.signals import post_save, pre_save
 from django.dispatch import receiver
+from django.urls import reverse
 from django.utils.translation import ugettext as _
+from model_utils.models import TimeStampedModel
+from six.moves.urllib.parse import urlunsplit  # pylint: disable=import-error
 
 from edxmako.shortcuts import render_to_string
-from model_utils.models import TimeStampedModel
 from openedx.core.djangoapps.site_configuration import helpers as configuration_helpers
 
 log = logging.getLogger(__name__)

openedx/core/djangoapps/api_admin/urls.py

@@ -1,5 +1,7 @@
 """URLs for API access management."""
 
+from __future__ import absolute_import
+
 from django.conf.urls import include, url
 from django.contrib.admin.views.decorators import staff_member_required
 from django.contrib.auth.decorators import login_required

openedx/core/djangoapps/api_admin/views.py

@@ -1,11 +1,13 @@
 """Views for API management."""
+from __future__ import absolute_import
+
 import logging
 
 from django.conf import settings
 from django.contrib.sites.shortcuts import get_current_site
-from django.urls import reverse, reverse_lazy
 from django.http.response import JsonResponse
 from django.shortcuts import redirect
+from django.urls import reverse, reverse_lazy
 from django.views.generic import View
 from django.views.generic.base import TemplateView
 from django.views.generic.edit import CreateView

openedx/core/djangoapps/api_admin/widgets.py

@@ -1,9 +1,11 @@
 """ Form widget classes """
 
+from __future__ import absolute_import
+
 from django.conf import settings
-from django.urls import reverse
 from django.forms.utils import flatatt
 from django.forms.widgets import CheckboxInput
+from django.urls import reverse
 from django.utils.encoding import force_text
 from django.utils.html import format_html
 from django.utils.translation import ugettext as _