diff --git a/lms/djangoapps/static_template_view/urls.py b/lms/djangoapps/static_template_view/urls.py index f6a09ef2f5..5dd3fa96be 100644 --- a/lms/djangoapps/static_template_view/urls.py +++ b/lms/djangoapps/static_template_view/urls.py @@ -38,7 +38,7 @@ for key, value in settings.MKTG_URL_LINK_MAP.items(): continue # These urls are enabled separately - if key == "ROOT" or key == "COURSES": + if key == "ROOT" or key == "COURSES": # lint-amnesty, pylint: disable=consider-using-in continue # The MKTG_URL_LINK_MAP key specifies the template filename diff --git a/lms/djangoapps/static_template_view/views.py b/lms/djangoapps/static_template_view/views.py index 76d317d1e9..ffe3a31338 100644 --- a/lms/djangoapps/static_template_view/views.py +++ b/lms/djangoapps/static_template_view/views.py @@ -68,9 +68,9 @@ def render(request, template): result = render_to_response('static_templates/' + template, context, content_type=content_type) return result except TopLevelLookupException: - raise Http404 + raise Http404 # lint-amnesty, pylint: disable=raise-missing-from except TemplateDoesNotExist: - raise Http404 + raise Http404 # lint-amnesty, pylint: disable=raise-missing-from @ensure_csrf_cookie @@ -87,13 +87,13 @@ def render_press_release(request, slug): try: resp = render_to_response('static_templates/press_releases/' + template, {}) except TemplateDoesNotExist: - raise Http404 + raise Http404 # lint-amnesty, pylint: disable=raise-missing-from else: return resp @fix_crum_request -def render_404(request, exception): +def render_404(request, exception): # lint-amnesty, pylint: disable=unused-argument request.view_name = '404' return HttpResponseNotFound(render_to_string('static_templates/404.html', {}, request=request)) diff --git a/lms/djangoapps/staticbook/tests.py b/lms/djangoapps/staticbook/tests.py index 91ed05e3b2..16be937b8e 100644 --- a/lms/djangoapps/staticbook/tests.py +++ b/lms/djangoapps/staticbook/tests.py @@ -50,7 +50,7 @@ class StaticBookTest(ModuleStoreTestCase): """ def __init__(self, *args, **kwargs): - super(StaticBookTest, self).__init__(*args, **kwargs) + super(StaticBookTest, self).__init__(*args, **kwargs) # lint-amnesty, pylint: disable=super-with-arguments self.course = None def make_course(self, **kwargs): diff --git a/lms/djangoapps/support/tests/test_views.py b/lms/djangoapps/support/tests/test_views.py index 20812ddd13..58dc04daa7 100644 --- a/lms/djangoapps/support/tests/test_views.py +++ b/lms/djangoapps/support/tests/test_views.py @@ -12,7 +12,7 @@ from uuid import UUID, uuid4 import ddt import six -from django.contrib.auth.models import User +from django.contrib.auth.models import User # lint-amnesty, pylint: disable=imported-auth-user from django.db.models import signals from django.http import HttpResponse from django.urls import reverse @@ -29,7 +29,7 @@ from lms.djangoapps.support.serializers import ProgramEnrollmentSerializer from lms.djangoapps.verify_student.models import VerificationDeadline from lms.djangoapps.verify_student.services import IDVerificationService from lms.djangoapps.verify_student.tests.factories import SSOVerificationFactory -from common.djangoapps.student.models import ENROLLED_TO_ENROLLED, CourseEnrollment, CourseEnrollmentAttribute, ManualEnrollmentAudit +from common.djangoapps.student.models import ENROLLED_TO_ENROLLED, CourseEnrollment, CourseEnrollmentAttribute, ManualEnrollmentAudit # lint-amnesty, pylint: disable=line-too-long from common.djangoapps.student.roles import GlobalStaff, SupportStaffRole from common.djangoapps.student.tests.factories import CourseEnrollmentFactory, UserFactory from common.djangoapps.third_party_auth.tests.factories import SAMLProviderConfigFactory @@ -48,7 +48,7 @@ class SupportViewTestCase(ModuleStoreTestCase): def setUp(self): """Create a user and log in. """ - super(SupportViewTestCase, self).setUp() + super(SupportViewTestCase, self).setUp() # lint-amnesty, pylint: disable=super-with-arguments self.user = UserFactory(username=self.USERNAME, email=self.EMAIL, password=self.PASSWORD) self.course = CourseFactory.create() success = self.client.login(username=self.USERNAME, password=self.PASSWORD) @@ -62,7 +62,7 @@ class SupportViewManageUserTests(SupportViewTestCase): def setUp(self): """Make the user support staff""" - super(SupportViewManageUserTests, self).setUp() + super(SupportViewManageUserTests, self).setUp() # lint-amnesty, pylint: disable=super-with-arguments SupportStaffRole().add_users(self.user) def test_get_contact_us(self): @@ -189,7 +189,7 @@ class SupportViewIndexTests(SupportViewTestCase): def setUp(self): """Make the user support staff. """ - super(SupportViewIndexTests, self).setUp() + super(SupportViewIndexTests, self).setUp() # lint-amnesty, pylint: disable=super-with-arguments SupportStaffRole().add_users(self.user) def test_index(self): @@ -207,7 +207,7 @@ class SupportViewCertificatesTests(SupportViewTestCase): """ def setUp(self): """Make the user support staff. """ - super(SupportViewCertificatesTests, self).setUp() + super(SupportViewCertificatesTests, self).setUp() # lint-amnesty, pylint: disable=super-with-arguments SupportStaffRole().add_users(self.user) def test_certificates_no_filter(self): @@ -234,7 +234,7 @@ class SupportViewEnrollmentsTests(SharedModuleStoreTestCase, SupportViewTestCase """Tests for the enrollment support view.""" def setUp(self): - super(SupportViewEnrollmentsTests, self).setUp() + super(SupportViewEnrollmentsTests, self).setUp() # lint-amnesty, pylint: disable=super-with-arguments SupportStaffRole().add_users(self.user) self.course = CourseFactory(display_name=u'teꜱᴛ') @@ -477,7 +477,7 @@ class SupportViewLinkProgramEnrollmentsTests(SupportViewTestCase): def setUp(self): """Make the user support staff. """ - super(SupportViewLinkProgramEnrollmentsTests, self).setUp() + super(SupportViewLinkProgramEnrollmentsTests, self).setUp() # lint-amnesty, pylint: disable=super-with-arguments self.url = reverse("support:link_program_enrollments") SupportStaffRole().add_users(self.user) self.program_uuid = str(uuid4()) @@ -645,7 +645,7 @@ class ProgramEnrollmentsInspectorViewTests(SupportViewTestCase): ) def setUp(self): - super(ProgramEnrollmentsInspectorViewTests, self).setUp() + super(ProgramEnrollmentsInspectorViewTests, self).setUp() # lint-amnesty, pylint: disable=super-with-arguments self.url = reverse("support:program_enrollments_inspector") SupportStaffRole().add_users(self.user) self.program_uuid = str(uuid4()) @@ -725,7 +725,7 @@ class ProgramEnrollmentsInspectorViewTests(SupportViewTestCase): is_active=True ) - program_course_enrollment = ProgramCourseEnrollmentFactory.create( + program_course_enrollment = ProgramCourseEnrollmentFactory.create( # lint-amnesty, pylint: disable=unused-variable program_enrollment=program_enrollment, course_key=course_id, course_enrollment=course_enrollment, @@ -962,11 +962,11 @@ class ProgramEnrollmentsInspectorViewTests(SupportViewTestCase): assert expected_error == render_call_dict['error'] -class SsoRecordsTests(SupportViewTestCase): +class SsoRecordsTests(SupportViewTestCase): # lint-amnesty, pylint: disable=missing-class-docstring def setUp(self): """Make the user support staff""" - super(SsoRecordsTests, self).setUp() + super(SsoRecordsTests, self).setUp() # lint-amnesty, pylint: disable=super-with-arguments SupportStaffRole().add_users(self.user) self.student = UserFactory.create(username='student', email='test@example.com', password='test') self.url = reverse("support:sso_records", kwargs={'username_or_email': self.student.username}) @@ -994,7 +994,7 @@ class SsoRecordsTests(SupportViewTestCase): self.assertEqual(len(data), 0) def test_response(self): - user_social_auth = UserSocialAuth.objects.create( + user_social_auth = UserSocialAuth.objects.create( # lint-amnesty, pylint: disable=unused-variable user=self.student, uid=self.student.email, provider='tpa-saml' diff --git a/lms/djangoapps/support/views/contact_us.py b/lms/djangoapps/support/views/contact_us.py index 8401546df8..4612ef4667 100644 --- a/lms/djangoapps/support/views/contact_us.py +++ b/lms/djangoapps/support/views/contact_us.py @@ -18,7 +18,7 @@ class ContactUsView(View): View for viewing and submitting contact us form. """ - def get(self, request): + def get(self, request): # lint-amnesty, pylint: disable=missing-function-docstring if not configuration_helpers.get_value('CONTACT_US_PAGE', True): raise Http404 diff --git a/lms/djangoapps/support/views/enrollments.py b/lms/djangoapps/support/views/enrollments.py index b505af2655..4a3c43039b 100644 --- a/lms/djangoapps/support/views/enrollments.py +++ b/lms/djangoapps/support/views/enrollments.py @@ -4,7 +4,7 @@ Support tool for changing course enrollments. import six -from django.contrib.auth.models import User +from django.contrib.auth.models import User # lint-amnesty, pylint: disable=imported-auth-user from django.db import transaction from django.db.models import Q from django.http import HttpResponseBadRequest @@ -25,7 +25,7 @@ from openedx.core.djangoapps.credit.email_utils import get_credit_provider_attri from openedx.core.djangoapps.enrollments.api import get_enrollments, update_enrollment from openedx.core.djangoapps.enrollments.errors import CourseModeNotFoundError from openedx.core.djangoapps.enrollments.serializers import ModeSerializer -from common.djangoapps.student.models import ENROLLED_TO_ENROLLED, CourseEnrollment, CourseEnrollmentAttribute, ManualEnrollmentAudit +from common.djangoapps.student.models import ENROLLED_TO_ENROLLED, CourseEnrollment, CourseEnrollmentAttribute, ManualEnrollmentAudit # lint-amnesty, pylint: disable=line-too-long from common.djangoapps.util.json_request import JsonResponse diff --git a/lms/djangoapps/support/views/program_enrollments.py b/lms/djangoapps/support/views/program_enrollments.py index 80d2c83359..c0454abc99 100644 --- a/lms/djangoapps/support/views/program_enrollments.py +++ b/lms/djangoapps/support/views/program_enrollments.py @@ -6,7 +6,7 @@ Support tool for changing course enrollments. import csv from uuid import UUID -from django.contrib.auth.models import User +from django.contrib.auth.models import User # lint-amnesty, pylint: disable=imported-auth-user from django.db.models import Q from django.utils.decorators import method_decorator from django.views.generic import View @@ -115,7 +115,7 @@ class LinkProgramEnrollmentSupportView(View): for item in ext_key_to_username.items() if item not in link_errors ] - errors = [message for message in link_errors.values()] + errors = [message for message in link_errors.values()] # lint-amnesty, pylint: disable=unnecessary-comprehension return successes, errors diff --git a/lms/djangoapps/support/views/sso_records.py b/lms/djangoapps/support/views/sso_records.py index 32e620be2c..00be03e6db 100644 --- a/lms/djangoapps/support/views/sso_records.py +++ b/lms/djangoapps/support/views/sso_records.py @@ -1,4 +1,8 @@ -from django.contrib.auth.models import User +""" +Views for SSO records. +""" + +from django.contrib.auth.models import User # lint-amnesty, pylint: disable=imported-auth-user from django.db.models import Q from django.utils.decorators import method_decorator from rest_framework.generics import GenericAPIView @@ -14,7 +18,7 @@ class SsoView(GenericAPIView): Returns a list of SSO records for a given user. """ @method_decorator(require_support_permission) - def get(self, request, username_or_email): + def get(self, request, username_or_email): # lint-amnesty, pylint: disable=missing-function-docstring try: user = User.objects.get(Q(username=username_or_email) | Q(email=username_or_email)) except User.DoesNotExist: