Merge pull request #20876 from amitvadhel/INCR-473

INCR-473: Make compatible with Python 3.x

lms/djangoapps/instructor_task/subtasks.py

@@ -1,6 +1,8 @@
 """
 This module contains celery task functions for handling the management of subtasks.
 """
+from __future__ import absolute_import
+
 import json
 import logging
 from contextlib import contextmanager
@@ -9,9 +11,11 @@ from time import time
 from uuid import uuid4
 
 import psutil
+import six
 from celery.states import READY_STATES, RETRY, SUCCESS
 from django.core.cache import cache
 from django.db import DatabaseError, transaction
+from six.moves import range, zip
 
 from util.db import outer_atomic
 
@@ -203,7 +207,7 @@ class SubtaskStatus(object):
 
     def __unicode__(self):
         """Return unicode version of a SubtaskStatus object representation."""
-        return unicode(repr(self))
+        return six.text_type(repr(self))
 
 
 def initialize_subtask_info(entry, action_name, total_num, subtask_id_list):

lms/djangoapps/instructor_task/tasks_base.py

@@ -1,6 +1,8 @@
 """
 Base class for Instructor celery tasks.
 """
+from __future__ import absolute_import
+
 import logging
 
 from celery import Task

lms/djangoapps/instructor_task/views.py

@@ -1,4 +1,6 @@
 
+from __future__ import absolute_import
+
 import json
 import logging
 

lms/djangoapps/program_enrollments/management/commands/tests/test_expire_waiting_enrollments.py

@@ -1,6 +1,8 @@
 """
 Tests for the expire_waiting_enrollments management command.
 """
+from __future__ import absolute_import
+
 import ddt
 from django.core.management import call_command
 from django.test import TestCase

lms/djangoapps/program_enrollments/migrations/0005_canceled_not_withdrawn.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.20 on 2019-06-03 13:14
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
 
 from django.db import migrations, models
 

lms/djangoapps/program_enrollments/tests/test_tasks.py

@@ -1,17 +1,19 @@
 """
 Unit tests for program_course_enrollments tasks
 """
+from __future__ import absolute_import
+
 from datetime import timedelta
+
 from django.db.models.base import ObjectDoesNotExist
 from django.test import TestCase
 from django.utils import timezone
 from freezegun import freeze_time
 from testfixtures import LogCapture
-from lms.djangoapps.program_enrollments.models import ProgramEnrollment, ProgramCourseEnrollment
+
+from lms.djangoapps.program_enrollments.models import ProgramCourseEnrollment, ProgramEnrollment
 from lms.djangoapps.program_enrollments.tasks import expire_waiting_enrollments, log
-from lms.djangoapps.program_enrollments.tests.factories import (
-    ProgramCourseEnrollmentFactory, ProgramEnrollmentFactory
-)
+from lms.djangoapps.program_enrollments.tests.factories import ProgramCourseEnrollmentFactory, ProgramEnrollmentFactory
 from student.tests.factories import UserFactory