diff --git a/lms/djangoapps/program_enrollments/management/commands/expire_waiting_enrollments.py b/lms/djangoapps/program_enrollments/management/commands/expire_waiting_enrollments.py index 40b175810b..fbfd8dfa7e 100644 --- a/lms/djangoapps/program_enrollments/management/commands/expire_waiting_enrollments.py +++ b/lms/djangoapps/program_enrollments/management/commands/expire_waiting_enrollments.py @@ -1,6 +1,10 @@ """ Management command to cleanup old waiting enrollments """ +from __future__ import absolute_import + import logging + from django.core.management.base import BaseCommand + from ... import tasks logger = logging.getLogger(__name__) diff --git a/lms/djangoapps/program_enrollments/models.py b/lms/djangoapps/program_enrollments/models.py index 6886629112..ee437bc81f 100644 --- a/lms/djangoapps/program_enrollments/models.py +++ b/lms/djangoapps/program_enrollments/models.py @@ -2,20 +2,21 @@ """ Django model specifications for the Program Enrollments API """ -from __future__ import unicode_literals +from __future__ import absolute_import, unicode_literals + import logging from django.contrib.auth.models import User from django.core.exceptions import ValidationError from django.db import models from django.utils.translation import ugettext_lazy as _ -from course_modes.models import CourseMode -from lms.djangoapps.program_enrollments.api.v1.constants import ( - CourseEnrollmentResponseStatuses as ProgramCourseEnrollmentResponseStatuses -) from model_utils.models import TimeStampedModel from opaque_keys.edx.django.models import CourseKeyField from simple_history.models import HistoricalRecords + +from course_modes.models import CourseMode +from lms.djangoapps.program_enrollments.api.v1.constants import \ + CourseEnrollmentResponseStatuses as ProgramCourseEnrollmentResponseStatuses from student.models import AlreadyEnrolledError, CourseEnrollment logger = logging.getLogger(__name__) # pylint: disable=invalid-name @@ -75,7 +76,7 @@ class ProgramEnrollment(TimeStampedModel): # pylint: disable=model-missing-unic """ return cls.objects.filter( program_uuid=program_uuid, - external_user_key__in=student_data.keys(), + external_user_key__in=list(student_data.keys()), ) @classmethod diff --git a/lms/djangoapps/program_enrollments/tasks.py b/lms/djangoapps/program_enrollments/tasks.py index 7344bf4834..7ab6a00ab3 100644 --- a/lms/djangoapps/program_enrollments/tasks.py +++ b/lms/djangoapps/program_enrollments/tasks.py @@ -1,11 +1,14 @@ """ Tasks for program enrollments """ -from datetime import timedelta +from __future__ import absolute_import + import logging +from datetime import timedelta + from celery import task from celery_utils.logged_task import LoggedTask from django.utils import timezone -from lms.djangoapps.program_enrollments.models import ProgramEnrollment, ProgramCourseEnrollment +from lms.djangoapps.program_enrollments.models import ProgramCourseEnrollment, ProgramEnrollment log = logging.getLogger(__name__) diff --git a/lms/djangoapps/program_enrollments/utils.py b/lms/djangoapps/program_enrollments/utils.py index d793e1431f..9035fb3e03 100644 --- a/lms/djangoapps/program_enrollments/utils.py +++ b/lms/djangoapps/program_enrollments/utils.py @@ -1,10 +1,14 @@ """ utility functions for program enrollments """ +from __future__ import absolute_import + import logging -from openedx.core.djangoapps.catalog.utils import get_programs + from organizations.models import Organization from social_django.models import UserSocialAuth + +from openedx.core.djangoapps.catalog.utils import get_programs from third_party_auth.models import SAMLProviderConfig log = logging.getLogger(__name__)