Merge pull request #21000 from edx/awais786/INCR-342

INCR-342

cms/djangoapps/cms_user_tasks/apps.py

@@ -3,6 +3,8 @@ CMS user tasks application configuration
 Signal handlers are connected here.
 """
 
+from __future__ import absolute_import
+
 from django.apps import AppConfig
 
 

cms/djangoapps/cms_user_tasks/tasks.py

@@ -2,6 +2,8 @@
 Celery tasks used by cms_user_tasks
 """
 
+from __future__ import absolute_import
+
 from boto.exception import NoAuthHandlerFound
 from celery.exceptions import MaxRetriesExceededError
 from celery.task import task

cms/djangoapps/maintenance/urls.py

@@ -1,11 +1,17 @@
 """
 URLs for the maintenance app.
 """
+from __future__ import absolute_import
+
 from django.conf.urls import url
 
 from .views import (
-    ForcePublishCourseView, MaintenanceIndexView,
-    AnnouncementIndexView, AnnouncementEditView, AnnouncementCreateView, AnnouncementDeleteView
+    AnnouncementCreateView,
+    AnnouncementDeleteView,
+    AnnouncementEditView,
+    AnnouncementIndexView,
+    ForcePublishCourseView,
+    MaintenanceIndexView
 )
 
 urlpatterns = [

cms/djangoapps/xblock_config/admin.py

@@ -2,6 +2,8 @@
 Django admin dashboard configuration for LMS XBlock infrastructure.
 """
 
+from __future__ import absolute_import
+
 from config_models.admin import ConfigurationModelAdmin, KeyedConfigurationModelAdmin
 from django.contrib import admin
 

cms/djangoapps/xblock_config/forms.py

@@ -1,6 +1,8 @@
 """
 Defines a form for providing validation of LTI consumer course-specific configuration.
 """
+from __future__ import absolute_import
+
 import logging
 
 from django import forms

cms/djangoapps/xblock_config/models.py

@@ -5,10 +5,13 @@ Includes:
     StudioConfig: A ConfigurationModel for managing Studio.
 """
 
+from __future__ import absolute_import
+
+import six
 from config_models.models import ConfigurationModel
 from django.db.models import TextField
-
 from opaque_keys.edx.django.models import CourseKeyField
+
 from openedx.core.lib.cache_utils import request_cached
 
 
@@ -80,6 +83,6 @@ class CourseEditLTIFieldsEnabledFlag(ConfigurationModel):
             en = ""
 
         return u"Course '{course_id}': Edit LTI access to Learner information {en}Enabled".format(
-            course_id=unicode(self.course_id),
+            course_id=six.text_type(self.course_id),
             en=en,
         )

cms/djangoapps/xblock_config/tests/test_models.py

@@ -1,6 +1,8 @@
 """
 Tests for the models that configures Edit LTI fields feature.
 """
+from __future__ import absolute_import
+
 from contextlib import contextmanager
 
 import ddt