diff --git a/lms/djangoapps/certificates/migrations/0011_certificatetemplate_alter_unique.py b/lms/djangoapps/certificates/migrations/0011_certificatetemplate_alter_unique.py index 11e9302f0042f21e0d853b16cefb97b9206a0789..0034948e8c64804da3732812232159788f607697 100644 --- a/lms/djangoapps/certificates/migrations/0011_certificatetemplate_alter_unique.py +++ b/lms/djangoapps/certificates/migrations/0011_certificatetemplate_alter_unique.py @@ -20,9 +20,9 @@ def revert_alter_unique(apps, schema_editor): for org_id, course_key, mode in all_unique_templates_ignoring_language: key = CourseKey.from_string(course_key) if course_key else CourseKeyField.Empty templates = CertificateTemplateModel.objects.filter(organization_id=org_id, course_key=key, mode=mode) - if templates.count() > 1: + if templates.count() > 1: # remove all templates past the first (null or default languages are ordered first) - language_specific_templates = templates.order_by('language')[1:] + language_specific_templates = templates.order_by('language')[1:] language_specific_template_ids = language_specific_templates.values_list('id', flat=True) for template in language_specific_templates: log.info('Deleting template ' + str(template.id) + ' with details {' + diff --git a/lms/djangoapps/certificates/views/support.py b/lms/djangoapps/certificates/views/support.py index 72b685e12e9b164ecd4c7c20ba1a34d4a5f4181f..af337a4a9c3c876dbebc018e684d9e701c4c7bb0 100644 --- a/lms/djangoapps/certificates/views/support.py +++ b/lms/djangoapps/certificates/views/support.py @@ -23,7 +23,6 @@ from xmodule.modulestore.django import modulestore from common.djangoapps.student.models import CourseEnrollment, User from common.djangoapps.util.json_request import JsonResponse from lms.djangoapps.certificates.api import get_certificates_for_user, regenerate_user_certificates -from lms.djangoapps.certificates.models import CertificateInvalidation from lms.djangoapps.certificates.permissions import GENERATE_ALL_CERTIFICATES, VIEW_ALL_CERTIFICATES from lms.djangoapps.instructor_task.api import generate_certificates_for_students from openedx.core.djangoapps.content.course_overviews.models import CourseOverview diff --git a/lms/djangoapps/commerce/utils.py b/lms/djangoapps/commerce/utils.py index 80e63566515679cc3b72b977985f9737e7133a85..f459e70ab190d4ce98b768b823683de6d7b74785 100644 --- a/lms/djangoapps/commerce/utils.py +++ b/lms/djangoapps/commerce/utils.py @@ -18,7 +18,6 @@ from common.djangoapps.course_modes.models import CourseMode from openedx.core.djangoapps.commerce.utils import ecommerce_api_client, is_commerce_service_configured from openedx.core.djangoapps.site_configuration import helpers as configuration_helpers from openedx.core.djangoapps.theming import helpers as theming_helpers -from common.djangoapps.student.models import CourseEnrollment # lint-amnesty, pylint: disable=unused-import from .models import CommerceConfiguration diff --git a/lms/djangoapps/course_api/blocks/permissions.py b/lms/djangoapps/course_api/blocks/permissions.py index d04989f632357ae97d438e41de0e94f81784560c..c0bda84cfc71d866d10aa4b761db273fab908783 100644 --- a/lms/djangoapps/course_api/blocks/permissions.py +++ b/lms/djangoapps/course_api/blocks/permissions.py @@ -9,7 +9,6 @@ from lms.djangoapps.courseware.access_response import AccessResponse from lms.djangoapps.courseware.access_utils import ACCESS_DENIED, ACCESS_GRANTED, check_public_access from lms.djangoapps.courseware.exceptions import CourseRunNotFound from lms.djangoapps.courseware.courses import get_course -from openedx.core.djangoapps.content.course_overviews.models import CourseOverview # lint-amnesty, pylint: disable=unused-import from common.djangoapps.student.models import CourseEnrollment from common.djangoapps.student.roles import CourseStaffRole from xmodule.course_module import COURSE_VISIBILITY_PUBLIC diff --git a/lms/djangoapps/course_api/serializers.py b/lms/djangoapps/course_api/serializers.py index 12c734c7054fa2dcb0530554bb1c641ec10fd003..36117b3cf23e3b2b3562f6944b83ab489aadf201 100644 --- a/lms/djangoapps/course_api/serializers.py +++ b/lms/djangoapps/course_api/serializers.py @@ -4,14 +4,11 @@ Course API Serializers. Representing course catalog data from edx_django_utils import monitoring as monitoring_utils -import six.moves.urllib.error # lint-amnesty, pylint: disable=wrong-import-order import six.moves.urllib.parse # lint-amnesty, pylint: disable=wrong-import-order -import six.moves.urllib.request # lint-amnesty, pylint: disable=wrong-import-order from django.urls import reverse from rest_framework import serializers from openedx.core.djangoapps.models.course_details import CourseDetails -from openedx.core.djangoapps.content.course_overviews.models import CourseOverview # lint-amnesty, pylint: disable=unused-import from openedx.core.lib.api.fields import AbsoluteURLField