INCR-450: Make compatible with Python 3.x (#21097)

lms/djangoapps/instructor/access.py

@@ -9,10 +9,12 @@ TO DO sync instructor and staff flags
         {instructor: true, staff: true}
 """
 
+from __future__ import absolute_import
+
 import logging
 
-from openedx.core.djangoapps.django_comment_common.models import Role
 from lms.djangoapps.instructor.enrollment import enroll_email, get_email_params
+from openedx.core.djangoapps.django_comment_common.models import Role
 from student.roles import CourseBetaTesterRole, CourseCcxCoachRole, CourseInstructorRole, CourseStaffRole
 
 log = logging.getLogger(__name__)

lms/djangoapps/instructor/apps.py

@@ -2,11 +2,14 @@
 Instructor Application Configuration
 """
 
+from __future__ import absolute_import
+
 from django.apps import AppConfig
 from django.conf import settings
 from edx_proctoring.runtime import set_runtime_service
+
 from openedx.core.constants import COURSE_ID_PATTERN
-from openedx.core.djangoapps.plugins.constants import ProjectType, SettingsType, PluginURLs, PluginSettings
+from openedx.core.djangoapps.plugins.constants import PluginSettings, PluginURLs, ProjectType, SettingsType
 
 
 class InstructorConfig(AppConfig):

lms/djangoapps/instructor/enrollment.py

@@ -4,11 +4,14 @@ Enrollment operations for use by instructor APIs.
 Does not include any access control, be sure to check access before calling.
 """
 
+from __future__ import absolute_import
+
 import json
 import logging
 from datetime import datetime
 
 import pytz
+import six
 from django.conf import settings
 from django.contrib.auth.models import User
 from django.core.mail import send_mail
@@ -17,38 +20,31 @@ from django.urls import reverse
 from django.utils.translation import override as override_language
 from edx_ace import ace
 from edx_ace.recipient import Recipient
+from eventtracking import tracker
 from six import text_type
+from submissions import api as sub_api  # installed from the edx-submissions repository
+from submissions.models import score_set
 
 from course_modes.models import CourseMode
 from courseware.models import StudentModule
-from eventtracking import tracker
-from lms.djangoapps.grades.api import (
-    constants as grades_constants,
-    events as grades_events,
-    signals as grades_signals,
-    disconnect_submissions_signal_receiver,
-)
+from lms.djangoapps.grades.api import constants as grades_constants
+from lms.djangoapps.grades.api import disconnect_submissions_signal_receiver
+from lms.djangoapps.grades.api import events as grades_events
+from lms.djangoapps.grades.api import signals as grades_signals
 from lms.djangoapps.instructor.message_types import (
     AccountCreationAndEnrollment,
     AddBetaTester,
     AllowedEnroll,
     AllowedUnenroll,
-    EnrollEnrolled,
     EnrolledUnenroll,
-    RemoveBetaTester,
+    EnrollEnrolled,
+    RemoveBetaTester
 )
 from openedx.core.djangoapps.lang_pref import LANGUAGE_KEY
 from openedx.core.djangoapps.site_configuration import helpers as configuration_helpers
 from openedx.core.djangoapps.user_api.models import UserPreference
-from student.models import (
-    CourseEnrollment,
-    CourseEnrollmentAllowed,
-    anonymous_id_for_user,
-    is_email_retired,
-)
 from openedx.core.djangolib.markup import Text
-from submissions import api as sub_api  # installed from the edx-submissions repository
-from submissions.models import score_set
+from student.models import CourseEnrollment, CourseEnrollmentAllowed, anonymous_id_for_user, is_email_retired
 from track.event_transaction_utils import (
     create_new_event_transaction_id,
     get_event_transaction_id,
@@ -270,8 +266,8 @@ def reset_student_attempts(course_id, student, module_state_key, requesting_user
                 with disconnect_submissions_signal_receiver(score_set):
                     clear_student_state(
                         user_id=user_id,
-                        course_id=unicode(course_id),
-                        item_id=unicode(module_state_key),
+                        course_id=six.text_type(course_id),
+                        item_id=six.text_type(module_state_key),
                         requesting_user_id=requesting_user_id
                     )
                 submission_cleared = True
@@ -302,14 +298,14 @@ def reset_student_attempts(course_id, student, module_state_key, requesting_user
         create_new_event_transaction_id()
         set_event_transaction_type(grades_events.STATE_DELETED_EVENT_TYPE)
         tracker.emit(
-            unicode(grades_events.STATE_DELETED_EVENT_TYPE),
+            six.text_type(grades_events.STATE_DELETED_EVENT_TYPE),
             {
-                'user_id': unicode(student.id),
-                'course_id': unicode(course_id),
-                'problem_id': unicode(module_state_key),
-                'instructor_id': unicode(requesting_user.id),
-                'event_transaction_id': unicode(get_event_transaction_id()),
-                'event_transaction_type': unicode(grades_events.STATE_DELETED_EVENT_TYPE),
+                'user_id': six.text_type(student.id),
+                'course_id': six.text_type(course_id),
+                'problem_id': six.text_type(module_state_key),
+                'instructor_id': six.text_type(requesting_user.id),
+                'event_transaction_id': six.text_type(get_event_transaction_id()),
+                'event_transaction_type': six.text_type(grades_events.STATE_DELETED_EVENT_TYPE),
             }
         )
         if not submission_cleared:
@@ -359,8 +355,8 @@ def _fire_score_changed_for_block(
                 raw_possible=max_score,
                 weight=getattr(block, 'weight', None),
                 user_id=student.id,
-                course_id=unicode(course_id),
-                usage_id=unicode(module_state_key),
+                course_id=six.text_type(course_id),
+                usage_id=six.text_type(module_state_key),
                 score_deleted=True,
                 only_if_higher=False,
                 modified=datetime.now().replace(tzinfo=pytz.UTC),

lms/djangoapps/instructor/enrollment_report.py

@@ -2,20 +2,22 @@
 Defines abstract class for the Enrollment Reports.
 """
 
+from __future__ import absolute_import
+
 import abc
 import collections
 import json
 
+import six
 from django.contrib.auth.models import User
 
 from student.models import UserProfile
 
 
-class AbstractEnrollmentReportProvider(object):
+class AbstractEnrollmentReportProvider(six.with_metaclass(abc.ABCMeta, object)):
     """
     Abstract interface for Detailed Enrollment Report Provider
     """
-    __metaclass__ = abc.ABCMeta
 
     @abc.abstractmethod
     def get_enrollment_info(self, user, course_id):

lms/djangoapps/instructor/message_types.py

@@ -2,6 +2,8 @@
 ACE message types for the instructor module.
 """
 
+from __future__ import absolute_import
+
 from openedx.core.djangoapps.ace_common.message import BaseMessageType
 
 

lms/djangoapps/instructor/paidcourse_enrollment_report.py

@@ -2,6 +2,8 @@
 Defines concrete class for cybersource  Enrollment Report.
 
 """
+from __future__ import absolute_import
+
 import collections
 
 from django.conf import settings

lms/djangoapps/instructor/services.py

@@ -2,6 +2,8 @@
 Implementation of "Instructor" service
 """
 
+from __future__ import absolute_import
+
 import logging
 
 from django.core.exceptions import ObjectDoesNotExist

lms/djangoapps/instructor/utils.py

@@ -2,6 +2,8 @@
 Helpers for instructor app.
 """
 
+from __future__ import absolute_import
+
 from courseware.model_data import FieldDataCache
 from courseware.module_render import get_module
 from xmodule.modulestore.django import modulestore