diff --git a/.github/workflows/pylint-checks.yml b/.github/workflows/pylint-checks.yml
deleted file mode 100644
index 91141c0c29ed..000000000000
--- a/.github/workflows/pylint-checks.yml
+++ /dev/null
@@ -1,85 +0,0 @@
-name: Pylint Checks
-
-on:
- pull_request:
- merge_group:
- push:
- branches:
- - master
-
-jobs:
- run-pylint:
- runs-on: ubuntu-24.04
- strategy:
- fail-fast: false
- matrix:
- include:
- - module-name: lms-1
- path: "lms/djangoapps/badges/ lms/djangoapps/branding/ lms/djangoapps/bulk_email/ lms/djangoapps/bulk_enroll/ lms/djangoapps/bulk_user_retirement/ lms/djangoapps/ccx/ lms/djangoapps/certificates/ lms/djangoapps/commerce/ lms/djangoapps/course_api/ lms/djangoapps/course_blocks/ lms/djangoapps/course_home_api/ lms/djangoapps/course_wiki/ lms/djangoapps/coursewarehistoryextended/ lms/djangoapps/debug/ lms/djangoapps/courseware/ lms/djangoapps/course_goals/ lms/djangoapps/rss_proxy/"
- - module-name: lms-2
- path: "lms/djangoapps/gating/ lms/djangoapps/grades/ lms/djangoapps/instructor/ lms/djangoapps/instructor_analytics/ lms/djangoapps/discussion/ lms/djangoapps/edxnotes/ lms/djangoapps/experiments/ lms/djangoapps/instructor_task/ lms/djangoapps/learner_dashboard/ lms/djangoapps/learner_home/ lms/djangoapps/lms_initialization/ lms/djangoapps/lms_xblock/ lms/djangoapps/lti_provider/ lms/djangoapps/mailing/ lms/djangoapps/mobile_api/ lms/djangoapps/monitoring/ lms/djangoapps/ora_staff_grader/ lms/djangoapps/program_enrollments/ lms/djangoapps/rss_proxy lms/djangoapps/static_template_view/ lms/djangoapps/staticbook/ lms/djangoapps/support/ lms/djangoapps/survey/ lms/djangoapps/teams/ lms/djangoapps/tests/ lms/djangoapps/user_tours/ lms/djangoapps/verify_student/ lms/djangoapps/mfe_config_api/ lms/envs/ lms/lib/ lms/tests.py"
- - module-name: openedx-1
- path: "openedx/core/types/ openedx/core/djangoapps/ace_common/ openedx/core/djangoapps/agreements/ openedx/core/djangoapps/api_admin/ openedx/core/djangoapps/auth_exchange/ openedx/core/djangoapps/bookmarks/ openedx/core/djangoapps/cache_toolbox/ openedx/core/djangoapps/catalog/ openedx/core/djangoapps/ccxcon/ openedx/core/djangoapps/commerce/ openedx/core/djangoapps/common_initialization/ openedx/core/djangoapps/common_views/ openedx/core/djangoapps/config_model_utils/ openedx/core/djangoapps/content/ openedx/core/djangoapps/content_libraries/ openedx/core/djangoapps/content_staging/ openedx/core/djangoapps/contentserver/ openedx/core/djangoapps/cookie_metadata/ openedx/core/djangoapps/cors_csrf/ openedx/core/djangoapps/course_apps/ openedx/core/djangoapps/course_date_signals/ openedx/core/djangoapps/course_groups/ openedx/core/djangoapps/courseware_api/ openedx/core/djangoapps/crawlers/ openedx/core/djangoapps/credentials/ openedx/core/djangoapps/credit/ openedx/core/djangoapps/dark_lang/ openedx/core/djangoapps/debug/ openedx/core/djangoapps/discussions/ openedx/core/djangoapps/django_comment_common/ openedx/core/djangoapps/embargo/ openedx/core/djangoapps/enrollments/ openedx/core/djangoapps/external_user_ids/ openedx/core/djangoapps/zendesk_proxy/ openedx/core/djangolib/ openedx/core/lib/ openedx/core/djangoapps/course_live/"
- - module-name: openedx-2
- path: "openedx/core/djangoapps/geoinfo/ openedx/core/djangoapps/header_control/ openedx/core/djangoapps/heartbeat/ openedx/core/djangoapps/lang_pref/ openedx/core/djangoapps/models/ openedx/core/djangoapps/monkey_patch/ openedx/core/djangoapps/oauth_dispatch/ openedx/core/djangoapps/olx_rest_api/ openedx/core/djangoapps/password_policy/ openedx/core/djangoapps/plugin_api/ openedx/core/djangoapps/plugins/ openedx/core/djangoapps/profile_images/ openedx/core/djangoapps/programs/ openedx/core/djangoapps/safe_sessions/ openedx/core/djangoapps/schedules/ openedx/core/djangoapps/service_status/ openedx/core/djangoapps/session_inactivity_timeout/ openedx/core/djangoapps/signals/ openedx/core/djangoapps/site_configuration/ openedx/core/djangoapps/system_wide_roles/ openedx/core/djangoapps/theming/ openedx/core/djangoapps/user_api/ openedx/core/djangoapps/user_authn/ openedx/core/djangoapps/util/ openedx/core/djangoapps/verified_track_content/ openedx/core/djangoapps/video_config/ openedx/core/djangoapps/video_pipeline/ openedx/core/djangoapps/waffle_utils/ openedx/core/djangoapps/xblock/ openedx/core/djangoapps/xmodule_django/ openedx/core/tests/ openedx/features/ openedx/testing/ openedx/tests/ openedx/envs/ openedx/core/djangoapps/notifications/ openedx/core/djangoapps/staticfiles/ openedx/core/djangoapps/content_tagging/ openedx/core/djangoapps/authz/"
- - module-name: common
- path: "common"
- - module-name: cms
- path: "cms"
- - module-name: xmodule
- path: "xmodule"
-
- name: pylint ${{ matrix.module-name }}
- steps:
- - name: Check out repo
- uses: actions/checkout@v6
-
- - name: Install required system packages
- run: sudo apt-get update && sudo apt-get install libxmlsec1-dev
-
- - name: Set up Python
- uses: actions/setup-python@v6
- with:
- python-version: 3.12
-
- - name: Get pip cache dir
- id: pip-cache-dir
- run: |
- echo "dir=$(pip cache dir)" >> $GITHUB_OUTPUT
-
- - name: Cache pip dependencies
- id: cache-dependencies
- uses: actions/cache@v5
- with:
- path: ${{ steps.pip-cache-dir.outputs.dir }}
- key: ${{ runner.os }}-pip-${{ hashFiles('requirements/edx/development.txt') }}
- restore-keys: ${{ runner.os }}-pip-
-
- - name: Install required Python dependencies
- run: |
- # dev-requirements is needed because the linter will otherwise
- # trip over some dev-only things like django-debug-toolbar
- # (import debug_toolbar) that aren't in testing.txt.
- make dev-requirements
- # After all requirements are installed, check that they're consistent with each other
- pip check
-
- - name: Run quality tests
- run: |
- pylint ${{ matrix.path }}
-
- # This job aggregates test results. It's the required check for branch protection.
- # https://github.com/marketplace/actions/alls-green#why
- # https://github.com/orgs/community/discussions/33579
- success:
- name: Pylint checks successful
- if: always()
- needs:
- - run-pylint
- runs-on: ubuntu-24.04
- steps:
- - name: Decide whether the needed jobs succeeded or failed
- # uses: re-actors/alls-green@v1.2.1
- uses: re-actors/alls-green@05ac9388f0aebcb5727afa17fcccfecd6f8ec5fe
- with:
- jobs: ${{ toJSON(needs) }}
diff --git a/.github/workflows/quality-checks.yml b/.github/workflows/quality-checks.yml
index b57b713eb93a..213bd860ce2a 100644
--- a/.github/workflows/quality-checks.yml
+++ b/.github/workflows/quality-checks.yml
@@ -6,11 +6,40 @@ on:
push:
branches:
- master
- - open-release/lilac.master
+ - release/**
jobs:
- run_tests:
- name: Quality Others
+ ruff:
+ name: Ruff
+ runs-on: ubuntu-24.04
+ steps:
+ - uses: actions/checkout@v6
+
+ - name: Setup Python
+ uses: actions/setup-python@v6
+ with:
+ python-version: "3.12"
+
+ - name: Get pip cache dir
+ id: pip-cache-dir
+ run: echo "dir=$(pip cache dir)" >> $GITHUB_OUTPUT
+
+ - name: Cache pip dependencies
+ uses: actions/cache@v5
+ with:
+ path: ${{ steps.pip-cache-dir.outputs.dir }}
+ key: ${{ runner.os }}-pip-${{ hashFiles('requirements/edx/testing.txt') }}
+ restore-keys: ${{ runner.os }}-pip-
+
+ - name: Install quality requirements
+ run: pip install -r requirements/edx/testing.txt
+
+ - name: Run ruff
+ run: ruff check --output-format=github .
+
+ policy-checks:
+ name: Policy & Security Checks
+ needs: [ruff]
runs-on: ${{ matrix.os }}
strategy:
matrix:
@@ -73,12 +102,11 @@ jobs:
run: |
pip install -e .
- - name: Run Quality Tests
+ - name: Run Policy Checks
env:
PIP_SRC: ${{ runner.temp }}
TARGET_BRANCH: ${{ github.base_ref }}
run: |
- ruff check --output-format=github .
make xsslint
make pii_check
make check_keywords
@@ -93,3 +121,82 @@ jobs:
test_root/log/**/*.log
*.log
overwrite: true
+
+ run-pylint:
+ needs: [ruff]
+ runs-on: ubuntu-24.04
+ strategy:
+ fail-fast: false
+ matrix:
+ include:
+ - module-name: lms-1
+ path: "lms/djangoapps/badges/ lms/djangoapps/branding/ lms/djangoapps/bulk_email/ lms/djangoapps/bulk_enroll/ lms/djangoapps/bulk_user_retirement/ lms/djangoapps/ccx/ lms/djangoapps/certificates/ lms/djangoapps/commerce/ lms/djangoapps/course_api/ lms/djangoapps/course_blocks/ lms/djangoapps/course_home_api/ lms/djangoapps/course_wiki/ lms/djangoapps/coursewarehistoryextended/ lms/djangoapps/debug/ lms/djangoapps/courseware/ lms/djangoapps/course_goals/ lms/djangoapps/rss_proxy/"
+ - module-name: lms-2
+ path: "lms/djangoapps/gating/ lms/djangoapps/grades/ lms/djangoapps/instructor/ lms/djangoapps/instructor_analytics/ lms/djangoapps/discussion/ lms/djangoapps/edxnotes/ lms/djangoapps/experiments/ lms/djangoapps/instructor_task/ lms/djangoapps/learner_dashboard/ lms/djangoapps/learner_home/ lms/djangoapps/lms_initialization/ lms/djangoapps/lms_xblock/ lms/djangoapps/lti_provider/ lms/djangoapps/mailing/ lms/djangoapps/mobile_api/ lms/djangoapps/monitoring/ lms/djangoapps/ora_staff_grader/ lms/djangoapps/program_enrollments/ lms/djangoapps/rss_proxy lms/djangoapps/static_template_view/ lms/djangoapps/staticbook/ lms/djangoapps/support/ lms/djangoapps/survey/ lms/djangoapps/teams/ lms/djangoapps/tests/ lms/djangoapps/user_tours/ lms/djangoapps/verify_student/ lms/djangoapps/mfe_config_api/ lms/envs/ lms/lib/ lms/tests.py"
+ - module-name: openedx-1
+ path: "openedx/core/types/ openedx/core/djangoapps/ace_common/ openedx/core/djangoapps/agreements/ openedx/core/djangoapps/api_admin/ openedx/core/djangoapps/auth_exchange/ openedx/core/djangoapps/bookmarks/ openedx/core/djangoapps/cache_toolbox/ openedx/core/djangoapps/catalog/ openedx/core/djangoapps/ccxcon/ openedx/core/djangoapps/commerce/ openedx/core/djangoapps/common_initialization/ openedx/core/djangoapps/common_views/ openedx/core/djangoapps/config_model_utils/ openedx/core/djangoapps/content/ openedx/core/djangoapps/content_libraries/ openedx/core/djangoapps/content_staging/ openedx/core/djangoapps/contentserver/ openedx/core/djangoapps/cookie_metadata/ openedx/core/djangoapps/cors_csrf/ openedx/core/djangoapps/course_apps/ openedx/core/djangoapps/course_date_signals/ openedx/core/djangoapps/course_groups/ openedx/core/djangoapps/courseware_api/ openedx/core/djangoapps/crawlers/ openedx/core/djangoapps/credentials/ openedx/core/djangoapps/credit/ openedx/core/djangoapps/dark_lang/ openedx/core/djangoapps/debug/ openedx/core/djangoapps/discussions/ openedx/core/djangoapps/django_comment_common/ openedx/core/djangoapps/embargo/ openedx/core/djangoapps/enrollments/ openedx/core/djangoapps/external_user_ids/ openedx/core/djangoapps/zendesk_proxy/ openedx/core/djangolib/ openedx/core/lib/ openedx/core/djangoapps/course_live/"
+ - module-name: openedx-2
+ path: "openedx/core/djangoapps/geoinfo/ openedx/core/djangoapps/header_control/ openedx/core/djangoapps/heartbeat/ openedx/core/djangoapps/lang_pref/ openedx/core/djangoapps/models/ openedx/core/djangoapps/monkey_patch/ openedx/core/djangoapps/oauth_dispatch/ openedx/core/djangoapps/olx_rest_api/ openedx/core/djangoapps/password_policy/ openedx/core/djangoapps/plugin_api/ openedx/core/djangoapps/plugins/ openedx/core/djangoapps/profile_images/ openedx/core/djangoapps/programs/ openedx/core/djangoapps/safe_sessions/ openedx/core/djangoapps/schedules/ openedx/core/djangoapps/service_status/ openedx/core/djangoapps/session_inactivity_timeout/ openedx/core/djangoapps/signals/ openedx/core/djangoapps/site_configuration/ openedx/core/djangoapps/system_wide_roles/ openedx/core/djangoapps/theming/ openedx/core/djangoapps/user_api/ openedx/core/djangoapps/user_authn/ openedx/core/djangoapps/util/ openedx/core/djangoapps/verified_track_content/ openedx/core/djangoapps/video_config/ openedx/core/djangoapps/video_pipeline/ openedx/core/djangoapps/waffle_utils/ openedx/core/djangoapps/xblock/ openedx/core/djangoapps/xmodule_django/ openedx/core/tests/ openedx/features/ openedx/testing/ openedx/tests/ openedx/envs/ openedx/core/djangoapps/notifications/ openedx/core/djangoapps/staticfiles/ openedx/core/djangoapps/content_tagging/ openedx/core/djangoapps/authz/"
+ - module-name: common
+ path: "common"
+ - module-name: cms
+ path: "cms"
+ - module-name: xmodule
+ path: "xmodule"
+
+ name: pylint ${{ matrix.module-name }}
+ steps:
+ - name: Check out repo
+ uses: actions/checkout@v6
+
+ - name: Install required system packages
+ run: sudo apt-get update && sudo apt-get install libxmlsec1-dev
+
+ - name: Set up Python
+ uses: actions/setup-python@v6
+ with:
+ python-version: "3.12"
+
+ - name: Get pip cache dir
+ id: pip-cache-dir
+ run: |
+ echo "dir=$(pip cache dir)" >> $GITHUB_OUTPUT
+
+ - name: Cache pip dependencies
+ id: cache-dependencies
+ uses: actions/cache@v5
+ with:
+ path: ${{ steps.pip-cache-dir.outputs.dir }}
+ key: ${{ runner.os }}-pip-${{ hashFiles('requirements/edx/development.txt') }}
+ restore-keys: ${{ runner.os }}-pip-
+
+ - name: Install required Python dependencies
+ run: |
+ # dev-requirements is needed because the linter will otherwise
+ # trip over some dev-only things like django-debug-toolbar
+ # (import debug_toolbar) that aren't in testing.txt.
+ make dev-requirements
+ # After all requirements are installed, check that they're consistent with each other
+ pip check
+
+ - name: Run quality tests
+ run: |
+ pylint ${{ matrix.path }}
+
+ # This job aggregates test results. It's the required check for branch protection.
+ # https://github.com/marketplace/actions/alls-green#why
+ # https://github.com/orgs/community/discussions/33579
+ success:
+ name: Quality checks successful
+ if: always()
+ needs:
+ - ruff
+ - policy-checks
+ - run-pylint
+ runs-on: ubuntu-24.04
+ steps:
+ - name: Decide whether the needed jobs succeeded or failed
+ # uses: re-actors/alls-green@v1.2.1
+ uses: re-actors/alls-green@05ac9388f0aebcb5727afa17fcccfecd6f8ec5fe
+ with:
+ jobs: ${{ toJSON(needs) }}
diff --git a/cms/djangoapps/api/v1/serializers/course_runs.py b/cms/djangoapps/api/v1/serializers/course_runs.py
index ab56ea40d341..84fca974730d 100644
--- a/cms/djangoapps/api/v1/serializers/course_runs.py
+++ b/cms/djangoapps/api/v1/serializers/course_runs.py
@@ -38,7 +38,7 @@ class CourseRunScheduleSerializer(serializers.Serializer): # lint-amnesty, pyli
enrollment_end = serializers.DateTimeField(allow_null=True, required=False)
-class CourseRunTeamSerializer(serializers.Serializer): # lint-amnesty, pylint: disable=abstract-method, missing-class-docstring
+class CourseRunTeamSerializer(serializers.Serializer): # pylint: disable=abstract-method, missing-class-docstring
def to_internal_value(self, data):
"""Overriding this to support deserialization, for write operations."""
for member in data:
@@ -61,7 +61,7 @@ def get_attribute(self, instance):
return instance
-class CourseRunTeamSerializerMixin(serializers.Serializer): # lint-amnesty, pylint: disable=abstract-method, missing-class-docstring
+class CourseRunTeamSerializerMixin(serializers.Serializer): # pylint: disable=abstract-method, missing-class-docstring
team = CourseRunTeamSerializer(required=False)
def update_team(self, instance, team): # lint-amnesty, pylint: disable=missing-function-docstring
@@ -100,7 +100,7 @@ def to_internal_value(self, data):
return data == 'self_paced'
-class CourseRunImageSerializer(serializers.Serializer): # lint-amnesty, pylint: disable=abstract-method, missing-class-docstring
+class CourseRunImageSerializer(serializers.Serializer): # pylint: disable=abstract-method, missing-class-docstring
# We set an empty default to prevent the parent serializer from attempting
# to save this value to the Course object.
card_image = CourseRunImageField(source='course_image', default=empty)
@@ -121,7 +121,7 @@ class CourseRunSerializerCommonFieldsMixin(serializers.Serializer): # lint-amne
choices=((False, 'instructor_paced'), (True, 'self_paced'),))
-class CourseRunSerializer(CourseRunSerializerCommonFieldsMixin, CourseRunTeamSerializerMixin, serializers.Serializer): # lint-amnesty, pylint: disable=abstract-method, missing-class-docstring
+class CourseRunSerializer(CourseRunSerializerCommonFieldsMixin, CourseRunTeamSerializerMixin, serializers.Serializer): # pylint: disable=abstract-method, missing-class-docstring
id = serializers.CharField(read_only=True)
title = serializers.CharField(source='display_name')
images = CourseRunImageSerializer(source='*', required=False)
@@ -155,7 +155,7 @@ def create(self, validated_data):
return instance
-class CourseRunRerunSerializer(CourseRunSerializerCommonFieldsMixin, CourseRunTeamSerializerMixin, # lint-amnesty, pylint: disable=abstract-method, missing-class-docstring
+class CourseRunRerunSerializer(CourseRunSerializerCommonFieldsMixin, CourseRunTeamSerializerMixin, # pylint: disable=abstract-method, missing-class-docstring
serializers.Serializer):
title = serializers.CharField(source='display_name', required=False)
number = serializers.CharField(source='id.course', required=False)
@@ -200,7 +200,7 @@ def update(self, instance, validated_data):
return course_run
-class CourseCloneSerializer(serializers.Serializer): # lint-amnesty, pylint: disable=abstract-method, missing-class-docstring
+class CourseCloneSerializer(serializers.Serializer): # pylint: disable=abstract-method, missing-class-docstring
source_course_id = serializers.CharField()
destination_course_id = serializers.CharField()
diff --git a/cms/djangoapps/api/v1/tests/test_views/test_course_runs.py b/cms/djangoapps/api/v1/tests/test_views/test_course_runs.py
index 4de6209e3729..eaeb9732340d 100644
--- a/cms/djangoapps/api/v1/tests/test_views/test_course_runs.py
+++ b/cms/djangoapps/api/v1/tests/test_views/test_course_runs.py
@@ -344,7 +344,7 @@ def test_rerun(self, pacing_type, expected_self_paced_value, number):
user = UserFactory()
role = 'instructor'
run = '3T2017'
- url = reverse('api:v1:course_run-rerun', kwargs={'pk': str(original_course_run.id)}) # lint-amnesty, pylint: disable=no-member
+ url = reverse('api:v1:course_run-rerun', kwargs={'pk': str(original_course_run.id)}) # pylint: disable=no-member
data = {
'run': run,
'schedule': {
@@ -383,7 +383,7 @@ def test_rerun(self, pacing_type, expected_self_paced_value, number):
self.assert_course_access_role_count(course_run, 1)
course_orgs = get_course_organizations(course_run_key)
self.assertEqual(len(course_orgs), 1) # noqa: PT009
- self.assertEqual(course_orgs[0]['short_name'], original_course_run.id.org) # lint-amnesty, pylint: disable=no-member # noqa: PT009
+ self.assertEqual(course_orgs[0]['short_name'], original_course_run.id.org) # pylint: disable=no-member # noqa: PT009
def test_rerun_duplicate_run(self):
course_run = ToyCourseFactory()
diff --git a/cms/djangoapps/api/v1/views/course_runs.py b/cms/djangoapps/api/v1/views/course_runs.py
index 065714a51218..f9f2f4cbabf2 100644
--- a/cms/djangoapps/api/v1/views/course_runs.py
+++ b/cms/djangoapps/api/v1/views/course_runs.py
@@ -53,7 +53,7 @@ def retrieve(self, request, *args, **kwargs): # lint-amnesty, pylint: disable=u
serializer = self.get_serializer(course_run)
return Response(serializer.data)
- def update(self, request, *args, **kwargs): # lint-amnesty, pylint: disable=missing-function-docstring, unused-argument
+ def update(self, request, *args, **kwargs): # pylint: disable=missing-function-docstring, unused-argument
course_run = self.get_object()
partial = kwargs.pop('partial', False)
@@ -77,7 +77,7 @@ def create(self, request, *args, **kwargs): # lint-amnesty, pylint: disable=unu
methods=['post', 'put'],
parser_classes=(parsers.FormParser, parsers.MultiPartParser,),
serializer_class=CourseRunImageSerializer)
- def images(self, request, *args, **kwargs): # lint-amnesty, pylint: disable=missing-function-docstring, unused-argument
+ def images(self, request, *args, **kwargs): # pylint: disable=missing-function-docstring, unused-argument
course_run = self.get_object()
serializer = CourseRunImageSerializer(course_run, data=request.data, context=self.get_serializer_context())
serializer.is_valid(raise_exception=True)
@@ -85,7 +85,7 @@ def images(self, request, *args, **kwargs): # lint-amnesty, pylint: disable=mis
return Response(serializer.data)
@action(detail=True, methods=['post'])
- def rerun(self, request, *args, **kwargs): # lint-amnesty, pylint: disable=missing-function-docstring, unused-argument
+ def rerun(self, request, *args, **kwargs): # pylint: disable=missing-function-docstring, unused-argument
course_run = self.get_object()
serializer = CourseRunRerunSerializer(course_run, data=request.data, context=self.get_serializer_context())
serializer.is_valid(raise_exception=True)
diff --git a/cms/djangoapps/contentstore/api/views/course_quality.py b/cms/djangoapps/contentstore/api/views/course_quality.py
index 1f51622cb4ab..acc276c018dd 100644
--- a/cms/djangoapps/contentstore/api/views/course_quality.py
+++ b/cms/djangoapps/contentstore/api/views/course_quality.py
@@ -135,7 +135,7 @@ def _execute_method_and_log_time(log_time, func, *args):
return Response(response)
- def _required_course_depth(self, request, all_requested): # lint-amnesty, pylint: disable=missing-function-docstring
+ def _required_course_depth(self, request, all_requested): # pylint: disable=missing-function-docstring
if get_bool_param(request, 'units', all_requested):
# The num_blocks metric for "units" requires retrieving all blocks in the graph.
return None
diff --git a/cms/djangoapps/contentstore/asset_storage_handlers.py b/cms/djangoapps/contentstore/asset_storage_handlers.py
index 06a76a904fcf..35b4061ded50 100644
--- a/cms/djangoapps/contentstore/asset_storage_handlers.py
+++ b/cms/djangoapps/contentstore/asset_storage_handlers.py
@@ -269,7 +269,7 @@ def _assets_json(request, course_key):
assets_usage_locations_map = _get_asset_usage_path(course_key, assets)
- if request_options['requested_page'] > 0 and first_asset_to_display_index >= total_count and total_count > 0: # lint-amnesty, pylint: disable=chained-comparison
+ if request_options['requested_page'] > 0 and first_asset_to_display_index >= total_count and total_count > 0: # pylint: disable=chained-comparison
_update_options_to_requery_final_page(query_options, total_count)
current_page = query_options['current_page']
first_asset_to_display_index = _get_first_asset_index(current_page, requested_page_size)
@@ -735,7 +735,7 @@ def _check_existence_and_get_asset_content(asset_key): # lint-amnesty, pylint:
raise AssetNotFoundException # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904
-def _delete_thumbnail(thumbnail_location, course_key, asset_key): # lint-amnesty, pylint: disable=missing-function-docstring
+def _delete_thumbnail(thumbnail_location, course_key, asset_key): # pylint: disable=missing-function-docstring
if thumbnail_location is not None:
# We are ignoring the value of the thumbnail_location-- we only care whether
diff --git a/cms/djangoapps/contentstore/config/waffle.py b/cms/djangoapps/contentstore/config/waffle.py
index 40d11817667e..9169e7f11472 100644
--- a/cms/djangoapps/contentstore/config/waffle.py
+++ b/cms/djangoapps/contentstore/config/waffle.py
@@ -32,6 +32,6 @@
# .. toggle_use_cases: temporary
# .. toggle_creation_date: 2021-07-12
# .. toggle_target_removal_date: 2021-12-31
-# .. toggle_warning: Flag course_experience.relative_dates should also be active for relative dates functionalities to work.
+# .. toggle_warning: Flag course_experience.relative_dates should also be active for relative dates functionalities to work. # noqa: E501
# .. toggle_tickets: https://openedx.atlassian.net/browse/AA-844
CUSTOM_RELATIVE_DATES = CourseWaffleFlag(f'{WAFFLE_NAMESPACE}.custom_relative_dates', __name__)
diff --git a/cms/djangoapps/contentstore/course_group_config.py b/cms/djangoapps/contentstore/course_group_config.py
index 2cbab53a6e6e..6126b6785805 100644
--- a/cms/djangoapps/contentstore/course_group_config.py
+++ b/cms/djangoapps/contentstore/course_group_config.py
@@ -67,7 +67,7 @@ def parse(json_string):
try:
configuration = json.loads(json_string.decode("utf-8"))
except ValueError:
- raise GroupConfigurationsValidationError(_("invalid JSON")) # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904
+ raise GroupConfigurationsValidationError(_("invalid JSON")) # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904, E501
configuration["version"] = UserPartition.VERSION
return configuration
@@ -116,7 +116,7 @@ def get_user_partition(self):
try:
return UserPartition.from_json(self.configuration)
except ReadOnlyUserPartitionError:
- raise GroupConfigurationsValidationError(_("unable to load this type of group configuration")) # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904
+ raise GroupConfigurationsValidationError(_("unable to load this type of group configuration")) # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904, E501
@staticmethod
def _get_usage_dict(course, unit, block, scheme_name=None):
diff --git a/cms/djangoapps/contentstore/courseware_index.py b/cms/djangoapps/contentstore/courseware_index.py
index 3061907a847d..0d4e5b08f19f 100644
--- a/cms/djangoapps/contentstore/courseware_index.py
+++ b/cms/djangoapps/contentstore/courseware_index.py
@@ -114,7 +114,7 @@ def remove_deleted_items(cls, searcher, structure_key, exclude_items):
searcher.remove(result_ids)
@classmethod
- def index(cls, modulestore, structure_key, triggered_at=None, reindex_age=REINDEX_AGE, timeout=INDEXING_REQUEST_TIMEOUT): # lint-amnesty, pylint: disable=line-too-long, too-many-statements
+ def index(cls, modulestore, structure_key, triggered_at=None, reindex_age=REINDEX_AGE, timeout=INDEXING_REQUEST_TIMEOUT): # pylint: disable=too-many-statements # noqa: E501
"""
Process course for indexing
@@ -630,7 +630,7 @@ def index_about_information(cls, modulestore, course):
# Broad exception handler so that a single bad property does not scupper the collection of others
try:
section_content = about_information.get_value(**about_context)
- except: # pylint: disable=bare-except
+ except: # noqa: E722
section_content = None
log.warning(
"Course discovery could not collect property %s for course %s",
diff --git a/cms/djangoapps/contentstore/exams.py b/cms/djangoapps/contentstore/exams.py
index 5a35d3fbe9f8..384dd1041e7a 100644
--- a/cms/djangoapps/contentstore/exams.py
+++ b/cms/djangoapps/contentstore/exams.py
@@ -33,7 +33,7 @@ def register_exams(course_key):
course = modulestore().get_course(course_key)
if course is None:
- raise ItemNotFoundError("Course {} does not exist", str(course_key)) # lint-amnesty, pylint: disable=raising-format-tuple
+ raise ItemNotFoundError("Course {} does not exist", str(course_key)) # pylint: disable=raising-format-tuple
# get all sequences, since they can be marked as timed/proctored exams
_timed_exams = modulestore().get_items(
diff --git a/cms/djangoapps/contentstore/git_export_utils.py b/cms/djangoapps/contentstore/git_export_utils.py
index 5f1c7877c4b2..1e63dd0ced7d 100644
--- a/cms/djangoapps/contentstore/git_export_utils.py
+++ b/cms/djangoapps/contentstore/git_export_utils.py
@@ -136,7 +136,7 @@ def export_to_git(course_id, repo, user='', rdir=None):
root_dir, course_dir)
except (OSError, AttributeError):
log.exception('Failed export to xml')
- raise GitExportError(GitExportError.XML_EXPORT_FAIL) # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904
+ raise GitExportError(GitExportError.XML_EXPORT_FAIL) # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904, E501
# Get current branch if not already set
if not branch:
diff --git a/cms/djangoapps/contentstore/management/commands/create_course.py b/cms/djangoapps/contentstore/management/commands/create_course.py
index 86e88beef774..1940c0dfc334 100644
--- a/cms/djangoapps/contentstore/management/commands/create_course.py
+++ b/cms/djangoapps/contentstore/management/commands/create_course.py
@@ -52,7 +52,7 @@ def get_user(self, user):
try:
user_object = user_from_str(user)
except User.DoesNotExist:
- raise CommandError(f"No user {user} found.") # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904
+ raise CommandError(f"No user {user} found.") # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904, E501
return user_object
def handle(self, *args, **options):
diff --git a/cms/djangoapps/contentstore/management/commands/delete_course.py b/cms/djangoapps/contentstore/management/commands/delete_course.py
index 8a64c64e26fe..729159278511 100644
--- a/cms/djangoapps/contentstore/management/commands/delete_course.py
+++ b/cms/djangoapps/contentstore/management/commands/delete_course.py
@@ -67,7 +67,7 @@ def handle(self, *args, **options):
course_key = str(options['course_key'])
course_key = CourseKey.from_string(course_key)
except InvalidKeyError:
- raise CommandError('Invalid course_key: {}'.format(options['course_key'])) # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904
+ raise CommandError('Invalid course_key: {}'.format(options['course_key'])) # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904, E501
if not modulestore().get_course(course_key):
raise CommandError('Course not found: {}'.format(options['course_key']))
@@ -80,6 +80,6 @@ def handle(self, *args, **options):
if options['remove_assets']:
contentstore().delete_all_course_assets(course_key)
- print(f'Deleted assets for course {course_key}') # lint-amnesty, pylint: disable=too-many-format-args
+ print(f'Deleted assets for course {course_key}') # pylint: disable=too-many-format-args
print(f'Deleted course {course_key}')
diff --git a/cms/djangoapps/contentstore/management/commands/export.py b/cms/djangoapps/contentstore/management/commands/export.py
index 76644d2d650b..e7f592e3b8b0 100644
--- a/cms/djangoapps/contentstore/management/commands/export.py
+++ b/cms/djangoapps/contentstore/management/commands/export.py
@@ -32,7 +32,7 @@ def handle(self, *args, **options):
try:
course_key = CourseKey.from_string(options['course_id'])
except InvalidKeyError:
- raise CommandError("Invalid course_key: '%s'." % options['course_id']) # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904, UP031
+ raise CommandError("Invalid course_key: '%s'." % options['course_id']) # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904, E501, UP031
if not modulestore().get_course(course_key):
raise CommandError("Course with %s key not found." % options['course_id']) # noqa: UP031
diff --git a/cms/djangoapps/contentstore/management/commands/export_content_library.py b/cms/djangoapps/contentstore/management/commands/export_content_library.py
index 7a6d4cfd2599..bbb21f667449 100644
--- a/cms/djangoapps/contentstore/management/commands/export_content_library.py
+++ b/cms/djangoapps/contentstore/management/commands/export_content_library.py
@@ -34,7 +34,7 @@ def handle(self, *args, **options):
try:
library_key = CourseKey.from_string(options['library_id'])
except InvalidKeyError:
- raise CommandError('Invalid library ID: "{}".'.format(options['library_id'])) # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904
+ raise CommandError('Invalid library ID: "{}".'.format(options['library_id'])) # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904, E501
if not isinstance(library_key, LibraryLocator):
raise CommandError('Argument "{}" is not a library key'.format(options['library_id']))
@@ -50,7 +50,7 @@ def handle(self, *args, **options):
# Generate archive using the handy tasks implementation
tarball = tasks.create_export_tarball(library, library_key, {}, None)
except Exception as e:
- raise CommandError(f'Failed to export "{library_key}" with "{e}"') # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904
+ raise CommandError(f'Failed to export "{library_key}" with "{e}"') # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904, E501
with tarball:
# Save generated archive with keyed filename
prefix, suffix, n = str(library_key).replace(':', '+'), '.tar.gz', 0
diff --git a/cms/djangoapps/contentstore/management/commands/export_olx.py b/cms/djangoapps/contentstore/management/commands/export_olx.py
index 6abed6bd043a..5064737eb7ce 100644
--- a/cms/djangoapps/contentstore/management/commands/export_olx.py
+++ b/cms/djangoapps/contentstore/management/commands/export_olx.py
@@ -49,7 +49,7 @@ def handle(self, *args, **options):
except InvalidKeyError:
raise CommandError("Unparsable course_id") # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904
except IndexError:
- raise CommandError("Insufficient arguments") # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904
+ raise CommandError("Insufficient arguments") # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904, E501
filename = options['output']
pipe_results = False
diff --git a/cms/djangoapps/contentstore/management/commands/generate_courses.py b/cms/djangoapps/contentstore/management/commands/generate_courses.py
index b1a2889a31a5..b87d2de4b6c3 100644
--- a/cms/djangoapps/contentstore/management/commands/generate_courses.py
+++ b/cms/djangoapps/contentstore/management/commands/generate_courses.py
@@ -35,7 +35,7 @@ def handle(self, *args, **options):
except ValueError:
raise CommandError("Invalid JSON object") # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904
except KeyError:
- raise CommandError("JSON object is missing courses list") # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904
+ raise CommandError("JSON object is missing courses list") # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904, E501
for course_settings in courses:
# Validate course
@@ -112,7 +112,7 @@ def _process_course_fields(self, fields):
fields[field] = Date().from_json(date_json)
logger.info(field + " has been set to " + date_json)
except Exception: # pylint: disable=broad-except
- logger.info("The date string could not be parsed for " + field) # lint-amnesty, pylint: disable=logging-not-lazy
+ logger.info("The date string could not be parsed for " + field) # pylint: disable=logging-not-lazy
del fields[field]
elif field in course_tab_list_fields:
# Generate CourseTabList object from the json value
@@ -121,11 +121,11 @@ def _process_course_fields(self, fields):
fields[field] = CourseTabList().from_json(course_tab_list_json)
logger.info(field + " has been set to " + course_tab_list_json)
except Exception: # pylint: disable=broad-except
- logger.info("The course tab list string could not be parsed for " + field) # lint-amnesty, pylint: disable=logging-not-lazy
+ logger.info("The course tab list string could not be parsed for " + field) # pylint: disable=logging-not-lazy
del fields[field]
else:
# CourseField is valid and has been set
- logger.info(field + " has been set to " + str(fields[field])) # lint-amnesty, pylint: disable=logging-not-lazy
+ logger.info(field + " has been set to " + str(fields[field])) # pylint: disable=logging-not-lazy
for field in all_fields:
if field not in fields:
@@ -156,7 +156,7 @@ def _course_is_valid(self, course):
if "fields" in course:
for setting in required_field_settings:
if setting not in course["fields"]:
- logger.warning("Fields json is missing " + setting) # lint-amnesty, pylint: disable=logging-not-lazy
+ logger.warning("Fields json is missing " + setting) # pylint: disable=logging-not-lazy
is_valid = False
return is_valid
diff --git a/cms/djangoapps/contentstore/management/commands/git_export.py b/cms/djangoapps/contentstore/management/commands/git_export.py
index a8193f8e3409..1c2a21535603 100644
--- a/cms/djangoapps/contentstore/management/commands/git_export.py
+++ b/cms/djangoapps/contentstore/management/commands/git_export.py
@@ -50,7 +50,7 @@ def handle(self, *args, **options):
try:
course_key = CourseKey.from_string(options['course_loc'])
except InvalidKeyError:
- raise CommandError(str(git_export_utils.GitExportError.BAD_COURSE)) # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904
+ raise CommandError(str(git_export_utils.GitExportError.BAD_COURSE)) # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904, E501
try:
git_export_utils.export_to_git(
diff --git a/cms/djangoapps/contentstore/management/commands/reindex_course.py b/cms/djangoapps/contentstore/management/commands/reindex_course.py
index e9d97ab91c33..826d9ced9d32 100644
--- a/cms/djangoapps/contentstore/management/commands/reindex_course.py
+++ b/cms/djangoapps/contentstore/management/commands/reindex_course.py
@@ -60,7 +60,7 @@ def _parse_course_key(self, raw_value):
try:
result = CourseKey.from_string(raw_value)
except InvalidKeyError:
- raise CommandError("Invalid course_key: '%s'." % raw_value) # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904, UP031
+ raise CommandError("Invalid course_key: '%s'." % raw_value) # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904, E501, UP031
if not isinstance(result, CourseLocator):
raise CommandError(f"Argument {raw_value} is not a course key")
diff --git a/cms/djangoapps/contentstore/management/commands/replace_v1_lib_refs_with_v2_in_courses.py b/cms/djangoapps/contentstore/management/commands/replace_v1_lib_refs_with_v2_in_courses.py
index 20d9e11bb14e..85a6f8f9a617 100644
--- a/cms/djangoapps/contentstore/management/commands/replace_v1_lib_refs_with_v2_in_courses.py
+++ b/cms/djangoapps/contentstore/management/commands/replace_v1_lib_refs_with_v2_in_courses.py
@@ -62,7 +62,7 @@ def replace_all_library_source_blocks_ids(self, v1_to_v2_lib_map):
def validate(self, v1_to_v2_lib_map):
""" Validate that replace_all_library_source_blocks_ids was successful"""
course_id_strings = list(CourseOverview.get_all_course_keys())
- tasks = group(validate_all_library_source_blocks_ids_for_course.s(course_id, v1_to_v2_lib_map) for course_id in course_id_strings) # lint-amnesty, pylint: disable=line-too-long
+ tasks = group(validate_all_library_source_blocks_ids_for_course.s(course_id, v1_to_v2_lib_map) for course_id in course_id_strings) # noqa: E501
results = tasks.apply_async()
validation = set()
diff --git a/cms/djangoapps/contentstore/management/commands/sync_courses.py b/cms/djangoapps/contentstore/management/commands/sync_courses.py
index 75b4e4988a92..be24260a5618 100644
--- a/cms/djangoapps/contentstore/management/commands/sync_courses.py
+++ b/cms/djangoapps/contentstore/management/commands/sync_courses.py
@@ -36,7 +36,7 @@ def get_user(self, user):
try:
user_object = user_from_str(user)
except User.DoesNotExist:
- raise CommandError(f"No user {user} found.") # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904
+ raise CommandError(f"No user {user} found.") # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904, E501
return user_object
def handle(self, *args, **options):
diff --git a/cms/djangoapps/contentstore/management/commands/tests/test_export_all_courses.py b/cms/djangoapps/contentstore/management/commands/tests/test_export_all_courses.py
index 71904e997c15..84fcfbcd67fe 100644
--- a/cms/djangoapps/contentstore/management/commands/tests/test_export_all_courses.py
+++ b/cms/djangoapps/contentstore/management/commands/tests/test_export_all_courses.py
@@ -27,7 +27,7 @@ class ExportAllCourses(ModuleStoreTestCase):
def setUp(self):
""" Common setup. """
super().setUp()
- self.store = modulestore()._get_modulestore_by_type(ModuleStoreEnum.Type.mongo) # lint-amnesty, pylint: disable=protected-access
+ self.store = modulestore()._get_modulestore_by_type(ModuleStoreEnum.Type.mongo) # pylint: disable=protected-access
self.temp_dir = mkdtemp()
self.addCleanup(shutil.rmtree, self.temp_dir)
self.first_course = CourseFactory.create(
diff --git a/cms/djangoapps/contentstore/proctoring.py b/cms/djangoapps/contentstore/proctoring.py
index 7a6e120c9721..7e00327eeea7 100644
--- a/cms/djangoapps/contentstore/proctoring.py
+++ b/cms/djangoapps/contentstore/proctoring.py
@@ -41,7 +41,7 @@ def register_special_exams(course_key):
course = modulestore().get_course(course_key)
if course is None:
- raise ItemNotFoundError("Course {} does not exist", str(course_key)) # lint-amnesty, pylint: disable=raising-format-tuple
+ raise ItemNotFoundError("Course {} does not exist", str(course_key)) # pylint: disable=raising-format-tuple
if not course.enable_proctored_exams and not course.enable_timed_exams:
# likewise if course does not have these features turned on
diff --git a/cms/djangoapps/contentstore/rest_api/v1/views/tests/test_group_configurations.py b/cms/djangoapps/contentstore/rest_api/v1/views/tests/test_group_configurations.py
index 496a50437104..094e545e3e12 100644
--- a/cms/djangoapps/contentstore/rest_api/v1/views/tests/test_group_configurations.py
+++ b/cms/djangoapps/contentstore/rest_api/v1/views/tests/test_group_configurations.py
@@ -38,7 +38,7 @@ def test_success_response(self):
"First name",
"First description",
[Group(0, "Group A"), Group(1, "Group B"), Group(2, "Group C")],
- ), # lint-amnesty, pylint: disable=line-too-long
+ ),
]
self.save_course()
diff --git a/cms/djangoapps/contentstore/rest_api/v1/views/tests/test_videos.py b/cms/djangoapps/contentstore/rest_api/v1/views/tests/test_videos.py
index 9da850244ccc..00edb50aad3b 100644
--- a/cms/djangoapps/contentstore/rest_api/v1/views/tests/test_videos.py
+++ b/cms/djangoapps/contentstore/rest_api/v1/views/tests/test_videos.py
@@ -120,14 +120,14 @@ def test_VideoTranscriptEnabledFlag_enabled(self):
str(self.course.id)
)
self.assertIn("transcript_preferences_handler_url", transcript_settings) # noqa: PT009
- self.assertEqual(expected_preference_handler, transcript_settings["transcript_preferences_handler_url"]) # noqa: PT009 # pylint: disable=line-too-long
+ self.assertEqual(expected_preference_handler, transcript_settings["transcript_preferences_handler_url"]) # noqa: PT009
expected_credentials_handler = reverse_course_url(
'transcript_credentials_handler',
str(self.course.id)
)
self.assertIn("transcript_credentials_handler_url", transcript_settings) # noqa: PT009
- self.assertEqual(expected_credentials_handler, transcript_settings["transcript_credentials_handler_url"]) # noqa: PT009 # pylint: disable=line-too-long
+ self.assertEqual(expected_credentials_handler, transcript_settings["transcript_credentials_handler_url"]) # noqa: PT009
with patch(
'openedx.core.djangoapps.video_config.toggles.XPERT_TRANSLATIONS_UI.is_enabled'
) as xpertTranslationfeature:
diff --git a/cms/djangoapps/contentstore/rest_api/v2/views/tests/test_downstreams.py b/cms/djangoapps/contentstore/rest_api/v2/views/tests/test_downstreams.py
index 149732437215..18a0fafa658e 100644
--- a/cms/djangoapps/contentstore/rest_api/v2/views/tests/test_downstreams.py
+++ b/cms/djangoapps/contentstore/rest_api/v2/views/tests/test_downstreams.py
@@ -127,7 +127,7 @@ def setUp(self):
self._publish_container(self.top_level_unit_id_2)
self._publish_container(self.top_level_subsection_id)
self._publish_container(self.top_level_section_id)
- self.mock_upstream_link = f"{settings.COURSE_AUTHORING_MICROFRONTEND_URL}/library/{self.library_id}/components?usageKey={self.video_lib_id}" # pylint: disable=line-too-long # noqa: E501
+ self.mock_upstream_link = f"{settings.COURSE_AUTHORING_MICROFRONTEND_URL}/library/{self.library_id}/components?usageKey={self.video_lib_id}" # noqa: E501
self.course = CourseFactory.create()
add_users(self.superuser, CourseStaffRole(self.course.id), self.course_user)
chapter = BlockFactory.create(category='chapter', parent=self.course)
diff --git a/cms/djangoapps/contentstore/signals/handlers.py b/cms/djangoapps/contentstore/signals/handlers.py
index 53476d0eb43a..8c9c6df4ae1c 100644
--- a/cms/djangoapps/contentstore/signals/handlers.py
+++ b/cms/djangoapps/contentstore/signals/handlers.py
@@ -75,7 +75,7 @@ def wrapper(*args, **kwargs):
return task_decorator
-def _create_catalog_data_for_signal(course_key: CourseKey) -> (Optional[datetime], Optional[CourseCatalogData]): # noqa: UP045 # pylint: disable=line-too-long
+def _create_catalog_data_for_signal(course_key: CourseKey) -> (Optional[datetime], Optional[CourseCatalogData]): # noqa: UP045
"""
Creates data for catalog-info-changed signal when course is published.
diff --git a/cms/djangoapps/contentstore/tasks.py b/cms/djangoapps/contentstore/tasks.py
index b73800053288..746b5e0eb227 100644
--- a/cms/djangoapps/contentstore/tasks.py
+++ b/cms/djangoapps/contentstore/tasks.py
@@ -437,7 +437,7 @@ def create_export_tarball(course_block, course_key, context, status=None):
if parent_loc is not None:
parent = modulestore().get_item(parent_loc)
- except: # pylint: disable=bare-except
+ except: # noqa: E722
# if we have a nested exception, then we'll show the more generic error message
pass
@@ -525,7 +525,7 @@ def sync_discussion_settings(course_key, user):
fields = ["enable_graded_units", "unit_level_visibility", "enable_in_context", "posting_restrictions"]
# Plugin configuration is stored in the course settings under the provider name.
- field_mappings = dict(zip(fields, fields)) | {"plugin_configuration": discussion_config.provider_type} # noqa: B905 # pylint: disable=line-too-long
+ field_mappings = dict(zip(fields, fields)) | {"plugin_configuration": discussion_config.provider_type} # noqa: B905
for attr_name, settings_key in field_mappings.items():
if settings_key in discussion_settings:
@@ -1007,7 +1007,7 @@ def validate_all_library_source_blocks_ids_for_course(course_key_string, v1_to_v
@shared_task(time_limit=30)
@set_code_owner_attribute
-def replace_all_library_source_blocks_ids_for_course(course_key_string, v1_to_v2_lib_map): # lint-amnesty, pylint: disable=useless-return
+def replace_all_library_source_blocks_ids_for_course(course_key_string, v1_to_v2_lib_map): # pylint: disable=useless-return
"""Search a Modulestore for all library source blocks in a course by querying mongo.
replace all source_library_ids with the corresponding v2 value from the map.
@@ -1066,7 +1066,7 @@ def replace_all_library_source_blocks_ids_for_course(course_key_string, v1_to_v2
@shared_task(time_limit=30)
@set_code_owner_attribute
-def undo_all_library_source_blocks_ids_for_course(course_key_string, v1_to_v2_lib_map): # lint-amnesty, pylint: disable=useless-return
+def undo_all_library_source_blocks_ids_for_course(course_key_string, v1_to_v2_lib_map): # pylint: disable=useless-return
"""Search a Modulestore for all library source blocks in a course by querying mongo.
replace all source_library_ids with the corresponding v1 value from the inverted map.
This is exists to undo changes made previously.
diff --git a/cms/djangoapps/contentstore/tests/test_clone_course.py b/cms/djangoapps/contentstore/tests/test_clone_course.py
index 2449c9269288..2a4b3134681c 100644
--- a/cms/djangoapps/contentstore/tests/test_clone_course.py
+++ b/cms/djangoapps/contentstore/tests/test_clone_course.py
@@ -70,7 +70,7 @@ def test_space_in_asset_name_for_rerun_course(self):
# Get & verify all assets of the course
assets, count = contentstore().get_all_content_for_course(course.id)
self.assertEqual(count, 1) # noqa: PT009
- self.assertEqual({asset['asset_key'].block_id for asset in assets}, course_assets) # lint-amnesty, pylint: disable=consider-using-set-comprehension # noqa: PT009
+ self.assertEqual({asset['asset_key'].block_id for asset in assets}, course_assets) # pylint: disable=consider-using-set-comprehension # noqa: PT009
# rerun from split into split
split_rerun_id = CourseLocator(org=org, course=course_number, run="2012_Q2")
@@ -129,14 +129,14 @@ def test_rerun_course(self):
)
# try to hit the generic exception catch
- with patch('xmodule.modulestore.split_mongo.mongo_connection.MongoPersistenceBackend.insert_course_index', Mock(side_effect=Exception)): # lint-amnesty, pylint: disable=line-too-long
+ with patch('xmodule.modulestore.split_mongo.mongo_connection.MongoPersistenceBackend.insert_course_index', Mock(side_effect=Exception)): # noqa: E501
split_course4_id = CourseLocator(org="edx3", course="split3", run="rerun_fail")
fields = {'display_name': 'total failure'}
CourseRerunState.objects.initiated(split_course3_id, split_course4_id, self.user, fields['display_name'])
result = rerun_course.delay(str(split_course3_id), str(split_course4_id), self.user.id,
json.dumps(fields, cls=EdxJSONEncoder))
self.assertIn("exception: ", result.get()) # noqa: PT009
- self.assertIsNone(self.store.get_course(split_course4_id), "Didn't delete course after error") # noqa: PT009 # pylint: disable=line-too-long
+ self.assertIsNone(self.store.get_course(split_course4_id), "Didn't delete course after error") # noqa: PT009
CourseRerunState.objects.find_first(
course_key=split_course4_id,
state=CourseRerunUIStateManager.State.FAILED
diff --git a/cms/djangoapps/contentstore/tests/test_contentstore.py b/cms/djangoapps/contentstore/tests/test_contentstore.py
index 5c33e156721b..b87d14c9a3fd 100644
--- a/cms/djangoapps/contentstore/tests/test_contentstore.py
+++ b/cms/djangoapps/contentstore/tests/test_contentstore.py
@@ -79,7 +79,7 @@ def decorated_func(*args, **kwargs):
try:
from PIL import Image
except ImportError:
- raise SkipTest("Pillow is not installed (or not found)") # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904
+ raise SkipTest("Pillow is not installed (or not found)") # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904, E501
if not getattr(Image.core, "jpeg_decoder", False):
raise SkipTest("Pillow cannot open JPEG files")
return func(*args, **kwargs)
@@ -301,7 +301,7 @@ def test_rewrite_nonportable_links_on_import(self):
html_block = self.store.get_item(html_block_location)
self.assertIn('/jump_to_id/nonportable_link', html_block.data) # noqa: PT009
- def verify_content_existence(self, store, root_dir, course_id, dirname, category_name, filename_suffix=''): # lint-amnesty, pylint: disable=missing-function-docstring
+ def verify_content_existence(self, store, root_dir, course_id, dirname, category_name, filename_suffix=''): # pylint: disable=missing-function-docstring
filesystem = OSFS(root_dir / 'test_export')
self.assertTrue(filesystem.exists(dirname)) # noqa: PT009
@@ -441,7 +441,7 @@ def test_html_export_roundtrip(self):
# get the sample HTML with styling information
html_block = self.store.get_item(course_id.make_usage_key('html', 'with_styling'))
- self.assertIn('', html_block.data) # noqa: PT009 # pylint: disable=line-too-long
+ self.assertIn('
', html_block.data) # noqa: PT009
# get the sample HTML with just a simple Advanced Settings ".encode('utf-8') # noqa: UP012 # pylint: disable=line-too-long
+ advanced_settings_link_html = f"Advanced Settings ".encode('utf-8') # noqa: UP012
with override_settings(FEATURES={
'DISABLE_ADVANCED_SETTINGS': disable_advanced_settings,
@@ -280,9 +280,9 @@ def compare_details_with_encoding(self, encoded, details, context):
details['about_sidebar_html'], encoded['about_sidebar_html'], context + " about_sidebar_html not =="
)
self.assertEqual(details['overview'], encoded['overview'], context + " overviews not ==") # noqa: PT009
- self.assertEqual(details['intro_video'], encoded.get('intro_video', None), context + " intro_video not ==") # noqa: PT009 # pylint: disable=line-too-long
+ self.assertEqual(details['intro_video'], encoded.get('intro_video', None), context + " intro_video not ==") # noqa: PT009
self.assertEqual(details['effort'], encoded['effort'], context + " efforts not ==") # noqa: PT009
- self.assertEqual(details['course_image_name'], encoded['course_image_name'], context + " images not ==") # noqa: PT009 # pylint: disable=line-too-long
+ self.assertEqual(details['course_image_name'], encoded['course_image_name'], context + " images not ==") # noqa: PT009
self.assertEqual(details['language'], encoded['language'], context + " languages not ==") # noqa: PT009
def compare_date_fields(self, details, encoded, context, field):
@@ -323,7 +323,7 @@ def test_upgrade_deadline(self, has_verified_mode, has_expiration_date):
settings_details_url = get_url(self.course.id)
response = self.client.get_html(settings_details_url)
- self.assertEqual(b"Upgrade Deadline Date" in response.content, has_expiration_date and has_verified_mode) # noqa: PT009 # pylint: disable=line-too-long
+ self.assertEqual(b"Upgrade Deadline Date" in response.content, has_expiration_date and has_verified_mode) # noqa: PT009
@mock.patch.dict("django.conf.settings.FEATURES", {'ENABLE_PREREQUISITE_COURSES': True})
@override_waffle_flag(toggles.LEGACY_STUDIO_SCHEDULE_DETAILS, True)
@@ -743,11 +743,9 @@ def test_update_from_json(self, send_signal, tracker, uuid):
# one for each of the calls to update_from_json()
send_signal.assert_has_calls([
- # pylint: disable=line-too-long
- mock.call(sender=CourseGradingModel, user_id=self.user.id, course_key=self.course.id, grading_policy_hash=grading_policy_2),
- mock.call(sender=CourseGradingModel, user_id=self.user.id, course_key=self.course.id, grading_policy_hash=grading_policy_3),
- mock.call(sender=CourseGradingModel, user_id=self.user.id, course_key=self.course.id, grading_policy_hash=grading_policy_4),
- # pylint: enable=line-too-long
+ mock.call(sender=CourseGradingModel, user_id=self.user.id, course_key=self.course.id, grading_policy_hash=grading_policy_2), # noqa: E501
+ mock.call(sender=CourseGradingModel, user_id=self.user.id, course_key=self.course.id, grading_policy_hash=grading_policy_3), # noqa: E501
+ mock.call(sender=CourseGradingModel, user_id=self.user.id, course_key=self.course.id, grading_policy_hash=grading_policy_4), # noqa: E501
])
# one for each of the calls to update_from_json(); the last update doesn't actually change the parts of the
@@ -865,10 +863,8 @@ def test_update_grader_from_json(self, send_signal, tracker, uuid):
# one for each of the calls to update_grader_from_json()
send_signal.assert_has_calls([
- # pylint: disable=line-too-long
- mock.call(sender=CourseGradingModel, user_id=self.user.id, course_key=self.course.id, grading_policy_hash=grading_policy_2),
- mock.call(sender=CourseGradingModel, user_id=self.user.id, course_key=self.course.id, grading_policy_hash=grading_policy_3),
- # pylint: enable=line-too-long
+ mock.call(sender=CourseGradingModel, user_id=self.user.id, course_key=self.course.id, grading_policy_hash=grading_policy_2), # noqa: E501
+ mock.call(sender=CourseGradingModel, user_id=self.user.id, course_key=self.course.id, grading_policy_hash=grading_policy_3), # noqa: E501
])
# one for each of the calls to update_grader_from_json()
@@ -906,7 +902,7 @@ def test_update_cutoffs_from_json(self, tracker, uuid):
test_grader.grade_cutoffs['Pass'] = 0.75
CourseGradingModel.update_cutoffs_from_json(self.course.id, test_grader.grade_cutoffs, self.user)
altered_grader = CourseGradingModel.fetch(self.course.id)
- self.assertDictEqual(test_grader.grade_cutoffs, altered_grader.grade_cutoffs, "cutoff change 'Pass'") # noqa: PT009 # pylint: disable=line-too-long
+ self.assertDictEqual(test_grader.grade_cutoffs, altered_grader.grade_cutoffs, "cutoff change 'Pass'") # noqa: PT009
grading_policy_3 = self._grading_policy_hash_for_course()
# one for each of the calls to update_cutoffs_from_json()
@@ -936,7 +932,7 @@ def test_delete_grace_period(self):
CourseGradingModel.update_grace_period_from_json(
self.course.id, test_grader.grace_period, self.user)
altered_grader = CourseGradingModel.fetch(self.course.id)
- self.assertDictEqual(test_grader.grace_period, altered_grader.grace_period, "Adding in a grace period") # noqa: PT009 # pylint: disable=line-too-long
+ self.assertDictEqual(test_grader.grace_period, altered_grader.grace_period, "Adding in a grace period") # noqa: PT009
test_grader.grace_period = {'hours': 1, 'minutes': 10, 'seconds': 0}
# Now delete the grace period
@@ -981,10 +977,8 @@ def test_update_section_grader_type(self, send_signal, tracker, uuid):
# one for each call to update_section_grader_type()
send_signal.assert_has_calls([
- # pylint: disable=line-too-long
- mock.call(sender=CourseGradingModel, user_id=self.user.id, course_key=self.course.id, grading_policy_hash=grading_policy_1),
- mock.call(sender=CourseGradingModel, user_id=self.user.id, course_key=self.course.id, grading_policy_hash=grading_policy_2),
- # pylint: enable=line-too-long
+ mock.call(sender=CourseGradingModel, user_id=self.user.id, course_key=self.course.id, grading_policy_hash=grading_policy_1), # noqa: E501
+ mock.call(sender=CourseGradingModel, user_id=self.user.id, course_key=self.course.id, grading_policy_hash=grading_policy_2), # noqa: E501
])
tracker.emit.assert_has_calls([
@@ -1061,11 +1055,9 @@ def test_add_delete_grader(self, send_signal):
self.assertNotIn(original_model['graders'][1], updated_model['graders']) # noqa: PT009
send_signal.assert_has_calls([
# once for the POST
- # pylint: disable=line-too-long
- mock.call(sender=CourseGradingModel, user_id=self.user.id, course_key=self.course.id, grading_policy_hash=grading_policy_hash1),
+ mock.call(sender=CourseGradingModel, user_id=self.user.id, course_key=self.course.id, grading_policy_hash=grading_policy_hash1), # noqa: E501
# once for the DELETE
- mock.call(sender=CourseGradingModel, user_id=self.user.id, course_key=self.course.id, grading_policy_hash=grading_policy_hash2),
- # pylint: enable=line-too-long
+ mock.call(sender=CourseGradingModel, user_id=self.user.id, course_key=self.course.id, grading_policy_hash=grading_policy_hash2), # noqa: E501
])
def setup_test_set_get_section_grader_ajax(self):
@@ -1346,7 +1338,7 @@ def test_validate_from_json_correct_inputs(self):
# Tab gets tested in test_advanced_settings_munge_tabs
self.assertIn('advanced_modules', test_model, 'Missing advanced_modules') # noqa: PT009
- self.assertEqual(test_model['advanced_modules']['value'], ['notes'], 'advanced_module is not updated') # noqa: PT009 # pylint: disable=line-too-long
+ self.assertEqual(test_model['advanced_modules']['value'], ['notes'], 'advanced_module is not updated') # noqa: PT009
def test_validate_from_json_wrong_inputs(self):
# input incorrectly formatted data
@@ -1417,7 +1409,7 @@ def test_update_from_json(self):
self.assertIn('display_name', test_model, 'Missing editable metadata field') # noqa: PT009
self.assertEqual(test_model['display_name']['value'], 'jolly roger', "not expected value") # noqa: PT009
self.assertIn('advertised_start', test_model, 'Missing revised advertised_start metadata field') # noqa: PT009
- self.assertEqual(test_model['advertised_start']['value'], 'start B', "advertised_start not expected value") # noqa: PT009 # pylint: disable=line-too-long
+ self.assertEqual(test_model['advertised_start']['value'], 'start B', "advertised_start not expected value") # noqa: PT009
def update_check(self, test_model):
"""
@@ -1426,9 +1418,9 @@ def update_check(self, test_model):
self.assertIn('display_name', test_model, 'Missing editable metadata field') # noqa: PT009
self.assertEqual(test_model['display_name']['value'], self.course.display_name) # noqa: PT009
self.assertIn('advertised_start', test_model, 'Missing new advertised_start metadata field') # noqa: PT009
- self.assertEqual(test_model['advertised_start']['value'], 'start A', "advertised_start not expected value") # noqa: PT009 # pylint: disable=line-too-long
+ self.assertEqual(test_model['advertised_start']['value'], 'start A', "advertised_start not expected value") # noqa: PT009
self.assertIn('days_early_for_beta', test_model, 'Missing days_early_for_beta metadata field') # noqa: PT009
- self.assertEqual(test_model['days_early_for_beta']['value'], 2, "days_early_for_beta not expected value") # noqa: PT009 # pylint: disable=line-too-long
+ self.assertEqual(test_model['days_early_for_beta']['value'], 2, "days_early_for_beta not expected value") # noqa: PT009
def test_http_fetch_initial_fields(self):
response = self.client.get_json(self.course_setting_url)
@@ -1465,7 +1457,7 @@ def test_http_update_from_json(self):
self.assertIn('display_name', test_model, 'Missing editable metadata field') # noqa: PT009
self.assertEqual(test_model['display_name']['value'], 'jolly roger', "not expected value") # noqa: PT009
self.assertIn('advertised_start', test_model, 'Missing revised advertised_start metadata field') # noqa: PT009
- self.assertEqual(test_model['advertised_start']['value'], 'start B', "advertised_start not expected value") # noqa: PT009 # pylint: disable=line-too-long
+ self.assertEqual(test_model['advertised_start']['value'], 'start B', "advertised_start not expected value") # noqa: PT009
@patch.dict(settings.FEATURES, {'ENABLE_EDXNOTES': True})
@patch('xmodule.util.xmodule_django.get_current_request')
diff --git a/cms/djangoapps/contentstore/tests/test_courseware_index.py b/cms/djangoapps/contentstore/tests/test_courseware_index.py
index f298b570b2b5..13629e5d6404 100644
--- a/cms/djangoapps/contentstore/tests/test_courseware_index.py
+++ b/cms/djangoapps/contentstore/tests/test_courseware_index.py
@@ -387,7 +387,7 @@ def _test_course_about_store_index(self, store):
field_dictionary={"course": str(self.course.id)}
)
self.assertEqual(response["total"], 1) # noqa: PT009
- self.assertEqual(response["results"][0]["data"]["content"]["short_description"], short_description) # noqa: PT009 # pylint: disable=line-too-long
+ self.assertEqual(response["results"][0]["data"]["content"]["short_description"], short_description) # noqa: PT009
def _test_course_about_mode_index(self, store):
"""
@@ -459,7 +459,7 @@ def _test_course_location_null(self, store):
result = response["results"][0]["data"]
self.assertEqual(result["course_name"], "Search Index Test Course") # noqa: PT009
- self.assertEqual(result["location"], ["Week 1", CoursewareSearchIndexer.UNNAMED_MODULE_NAME, "Subsection 2"]) # noqa: PT009 # pylint: disable=line-too-long
+ self.assertEqual(result["location"], ["Week 1", CoursewareSearchIndexer.UNNAMED_MODULE_NAME, "Subsection 2"]) # noqa: PT009
@patch('django.conf.settings.SEARCH_ENGINE', 'search.tests.utils.ErroringIndexEngine')
def _test_exception(self, store):
@@ -584,7 +584,7 @@ def _test_large_course_deletion(self, store):
load_factor = 6
try:
self._do_test_large_course_deletion(store, load_factor)
- except: # pylint: disable=bare-except
+ except: # noqa: E722
# Catch any exception here to see when we fail
print(f"Failed with load_factor of {load_factor}")
@@ -1199,7 +1199,7 @@ def test_content_group_gets_indexed(self):
self.assertIn(self._html_experiment_group_result(self.html_unit4, [str(2)]), indexed_content) # noqa: PT009
self.assertIn(self._html_experiment_group_result(self.html_unit5, [str(3)]), indexed_content) # noqa: PT009
self.assertIn(self._html_experiment_group_result(self.html_unit6, [str(4)]), indexed_content) # noqa: PT009
- self.assertNotIn(self._html_experiment_group_result(self.html_unit6, [str(5)]), indexed_content) # noqa: PT009 # pylint: disable=line-too-long
+ self.assertNotIn(self._html_experiment_group_result(self.html_unit6, [str(5)]), indexed_content) # noqa: PT009
self.assertIn( # noqa: PT009
self._vertical_experiment_group_result(self.condition_0_vertical, [str(2)]),
indexed_content
diff --git a/cms/djangoapps/contentstore/tests/test_import.py b/cms/djangoapps/contentstore/tests/test_import.py
index d7e8d7905842..af703184f776 100644
--- a/cms/djangoapps/contentstore/tests/test_import.py
+++ b/cms/djangoapps/contentstore/tests/test_import.py
@@ -239,7 +239,7 @@ def test_rewrite_reference_value_dict_draft(self):
{"0": '9f0941d021414798836ef140fb5f6841', "1": '0faf29473cf1497baa33fcc828b179cd'},
)
- def _verify_split_test_import(self, target_course_name, source_course_name, split_test_name, groups_to_verticals): # lint-amnesty, pylint: disable=missing-function-docstring
+ def _verify_split_test_import(self, target_course_name, source_course_name, split_test_name, groups_to_verticals): # pylint: disable=missing-function-docstring
module_store = modulestore()
target_id = module_store.make_course_key('testX', target_course_name, 'copy_run')
import_course_from_xml(
diff --git a/cms/djangoapps/contentstore/tests/test_import_draft_order.py b/cms/djangoapps/contentstore/tests/test_import_draft_order.py
index 16ba4872655f..b039f3fcd209 100644
--- a/cms/djangoapps/contentstore/tests/test_import_draft_order.py
+++ b/cms/djangoapps/contentstore/tests/test_import_draft_order.py
@@ -38,7 +38,7 @@ def test_order(self):
# '5a05be9d59fc4bb79282c94c9e6b88c7' and 'second' are public verticals.
self.assertEqual(7, len(verticals)) # noqa: PT009
self.assertEqual(course_key.make_usage_key('vertical', 'z'), verticals[0]) # noqa: PT009
- self.assertEqual(course_key.make_usage_key('vertical', '5a05be9d59fc4bb79282c94c9e6b88c7'), verticals[1]) # noqa: PT009 # pylint: disable=line-too-long
+ self.assertEqual(course_key.make_usage_key('vertical', '5a05be9d59fc4bb79282c94c9e6b88c7'), verticals[1]) # noqa: PT009
self.assertEqual(course_key.make_usage_key('vertical', 'a'), verticals[2]) # noqa: PT009
self.assertEqual(course_key.make_usage_key('vertical', 'second'), verticals[3]) # noqa: PT009
self.assertEqual(course_key.make_usage_key('vertical', 'b'), verticals[4]) # noqa: PT009
diff --git a/cms/djangoapps/contentstore/tests/test_libraries.py b/cms/djangoapps/contentstore/tests/test_libraries.py
index 29a194fd017e..503ca4be7b79 100644
--- a/cms/djangoapps/contentstore/tests/test_libraries.py
+++ b/cms/djangoapps/contentstore/tests/test_libraries.py
@@ -499,10 +499,10 @@ def test_library_filters(self):
self._create_library(library="l3", display_name="Library-Title-3", org='org-test1')
self._create_library(library="l4", display_name="Library-Title-4", org='org-test2')
- self.assertEqual(len(self.client.get_json(LIBRARY_REST_URL).json()), 5) # 1 more from self.setUp() # noqa: PT009 # pylint: disable=line-too-long
+ self.assertEqual(len(self.client.get_json(LIBRARY_REST_URL).json()), 5) # 1 more from self.setUp() # noqa: E501, PT009
self.assertEqual(len(self.client.get_json(f'{LIBRARY_REST_URL}?org=org-test1').json()), 2) # noqa: PT009
self.assertEqual(len(self.client.get_json(f'{LIBRARY_REST_URL}?text_search=test-lib').json()), 2) # noqa: PT009
- self.assertEqual(len(self.client.get_json(f'{LIBRARY_REST_URL}?text_search=library-title').json()), 3) # noqa: PT009 # pylint: disable=line-too-long
+ self.assertEqual(len(self.client.get_json(f'{LIBRARY_REST_URL}?text_search=library-title').json()), 3) # noqa: PT009
self.assertEqual(len(self.client.get_json(f'{LIBRARY_REST_URL}?text_search=library-').json()), 3) # noqa: PT009
self.assertEqual(len(self.client.get_json(f'{LIBRARY_REST_URL}?text_search=org-test').json()), 3) # noqa: PT009
diff --git a/cms/djangoapps/contentstore/tests/test_permissions.py b/cms/djangoapps/contentstore/tests/test_permissions.py
index 86e77118426d..a82905521dbb 100644
--- a/cms/djangoapps/contentstore/tests/test_permissions.py
+++ b/cms/djangoapps/contentstore/tests/test_permissions.py
@@ -101,7 +101,7 @@ def test_get_all_users(self):
user = users.pop()
group.add_users(user)
user_by_role[role].append(user)
- self.assertTrue(auth.has_course_author_access(user, self.course_key), f"{user} does not have access") # lint-amnesty, pylint: disable=line-too-long # noqa: PT009
+ self.assertTrue(auth.has_course_author_access(user, self.course_key), f"{user} does not have access") # noqa: PT009
course_team_url = reverse_course_url('course_team_handler', self.course_key)
response = self.client.get_html(course_team_url)
@@ -134,9 +134,9 @@ def test_get_all_users(self):
if hasattr(user, '_roles'):
del user._roles
- self.assertTrue(auth.has_course_author_access(user, copy_course_key), f"{user} no copy access") # noqa: PT009 # pylint: disable=line-too-long
+ self.assertTrue(auth.has_course_author_access(user, copy_course_key), f"{user} no copy access") # noqa: PT009
if (role is OrgStaffRole) or (role is OrgInstructorRole):
auth.remove_users(self.user, role(self.course_key.org), user)
else:
auth.remove_users(self.user, role(self.course_key), user)
- self.assertFalse(auth.has_course_author_access(user, self.course_key), f"{user} remove didn't work") # lint-amnesty, pylint: disable=line-too-long # noqa: PT009
+ self.assertFalse(auth.has_course_author_access(user, self.course_key), f"{user} remove didn't work") # noqa: PT009
diff --git a/cms/djangoapps/contentstore/tests/test_proctoring.py b/cms/djangoapps/contentstore/tests/test_proctoring.py
index 83b46ca2a063..b4e936de33c7 100644
--- a/cms/djangoapps/contentstore/tests/test_proctoring.py
+++ b/cms/djangoapps/contentstore/tests/test_proctoring.py
@@ -70,7 +70,7 @@ def _verify_exam_data(self, sequence, expected_active):
self.assertEqual(exam['exam_name'], sequence.display_name) # noqa: PT009
self.assertEqual(exam['time_limit_mins'], sequence.default_time_limit_minutes) # noqa: PT009
self.assertEqual(exam['is_proctored'], sequence.is_proctored_exam) # noqa: PT009
- self.assertEqual(exam['is_practice_exam'], sequence.is_practice_exam or sequence.is_onboarding_exam) # noqa: PT009 # pylint: disable=line-too-long
+ self.assertEqual(exam['is_practice_exam'], sequence.is_practice_exam or sequence.is_onboarding_exam) # noqa: PT009
self.assertEqual(exam['is_active'], expected_active) # noqa: PT009
self.assertEqual(exam['backend'], self.course.proctoring_provider) # noqa: PT009
diff --git a/cms/djangoapps/contentstore/tests/test_tasks.py b/cms/djangoapps/contentstore/tests/test_tasks.py
index e1dd0b68d273..50fe216cff04 100644
--- a/cms/djangoapps/contentstore/tests/test_tasks.py
+++ b/cms/djangoapps/contentstore/tests/test_tasks.py
@@ -224,7 +224,7 @@ class RegisterExamsTaskTestCase(CourseTestCase): # pylint: disable=missing-clas
@mock.patch('cms.djangoapps.contentstore.exams.register_exams')
@mock.patch('cms.djangoapps.contentstore.proctoring.register_special_exams')
- def test_exam_service_not_enabled_success(self, _mock_register_exams_proctoring, _mock_register_exams_service): # noqa: PT019 # pylint: disable=line-too-long
+ def test_exam_service_not_enabled_success(self, _mock_register_exams_proctoring, _mock_register_exams_service): # noqa: PT019
""" edx-proctoring interface is called if exam service is not enabled """
update_special_exams_and_publish(str(self.course.id))
_mock_register_exams_proctoring.assert_called_once_with(self.course.id)
@@ -233,7 +233,7 @@ def test_exam_service_not_enabled_success(self, _mock_register_exams_proctoring,
@mock.patch('cms.djangoapps.contentstore.exams.register_exams')
@mock.patch('cms.djangoapps.contentstore.proctoring.register_special_exams')
@override_waffle_flag(EXAMS_IDA, active=True)
- def test_exam_service_enabled_success(self, _mock_register_exams_proctoring, _mock_register_exams_service): # noqa: PT019 # pylint: disable=line-too-long
+ def test_exam_service_enabled_success(self, _mock_register_exams_proctoring, _mock_register_exams_service): # noqa: PT019
""" exams service interface is called if exam service is enabled """
update_special_exams_and_publish(str(self.course.id))
_mock_register_exams_proctoring.assert_not_called()
@@ -261,7 +261,7 @@ class CheckBrokenLinksTaskTest(ModuleStoreTestCase):
"""Tests for CheckBrokenLinksTask"""
def setUp(self):
super().setUp()
- self.store = modulestore()._get_modulestore_by_type(ModuleStoreEnum.Type.mongo) # lint-amnesty, pylint: disable=protected-access
+ self.store = modulestore()._get_modulestore_by_type(ModuleStoreEnum.Type.mongo) # pylint: disable=protected-access
self.test_course = CourseFactory.create(
org="test", course="course1", display_name="run1"
)
diff --git a/cms/djangoapps/contentstore/tests/test_transcripts_utils.py b/cms/djangoapps/contentstore/tests/test_transcripts_utils.py
index 721bc59eb2d2..3a208a826759 100644
--- a/cms/djangoapps/contentstore/tests/test_transcripts_utils.py
+++ b/cms/djangoapps/contentstore/tests/test_transcripts_utils.py
@@ -361,7 +361,7 @@ def test_fail_bad_subs_filedata(self):
with self.assertRaises(TranscriptsGenerationException) as cm: # noqa: PT027
transcripts_utils.generate_subs_from_source(youtube_subs, 'srt', srt_filedata, self.course)
exception_message = str(cm.exception)
- self.assertEqual(exception_message, "Something wrong with SubRip transcripts file during parsing.") # noqa: PT009 # pylint: disable=line-too-long
+ self.assertEqual(exception_message, "Something wrong with SubRip transcripts file during parsing.") # noqa: PT009
class TestGenerateSrtFromSjson(TestDownloadYoutubeSubs): # lint-amnesty, pylint: disable=test-inherits-tests
diff --git a/cms/djangoapps/contentstore/tests/test_utils.py b/cms/djangoapps/contentstore/tests/test_utils.py
index 85e694f02e24..7c380f82bae6 100644
--- a/cms/djangoapps/contentstore/tests/test_utils.py
+++ b/cms/djangoapps/contentstore/tests/test_utils.py
@@ -44,7 +44,7 @@ def lms_link_test(self):
course_key = CourseLocator('mitX', '101', 'test')
location = course_key.make_usage_key('vertical', 'contacting_us')
link = utils.get_lms_link_for_item(location, False)
- self.assertEqual(link, "//localhost:8000/courses/course-v1:mitX+101+test/jump_to/block-v1:mitX+101+test+type" # noqa: PT009 # pylint: disable=line-too-long
+ self.assertEqual(link, "//localhost:8000/courses/course-v1:mitX+101+test/jump_to/block-v1:mitX+101+test+type" # noqa: PT009
"@vertical+block@contacting_us")
# test preview
@@ -58,7 +58,7 @@ def lms_link_test(self):
# now test with the course' location
location = course_key.make_usage_key('course', 'test')
link = utils.get_lms_link_for_item(location)
- self.assertEqual(link, "//localhost:8000/courses/course-v1:mitX+101+test/jump_to/block-v1:mitX+101+test+type" # noqa: PT009 # pylint: disable=line-too-long
+ self.assertEqual(link, "//localhost:8000/courses/course-v1:mitX+101+test/jump_to/block-v1:mitX+101+test+type" # noqa: PT009
"@course+block@test")
def lms_link_for_certificate_web_view_test(self):
@@ -159,7 +159,7 @@ def _test_visible_to_students(self, expected_visible_without_lock, name, start_d
with and without visible_to_staff_only set.
"""
no_staff_lock = self._create_xblock_with_start_date(name, start_date, publish, visible_to_staff_only=False)
- self.assertEqual(expected_visible_without_lock, utils.is_currently_visible_to_students(no_staff_lock)) # noqa: PT009 # pylint: disable=line-too-long
+ self.assertEqual(expected_visible_without_lock, utils.is_currently_visible_to_students(no_staff_lock)) # noqa: PT009
# any xblock with visible_to_staff_only set to True should not be visible to students.
staff_lock = self._create_xblock_with_start_date(
diff --git a/cms/djangoapps/contentstore/tests/test_video_utils.py b/cms/djangoapps/contentstore/tests/test_video_utils.py
index 1fb1ed76ccb7..9ab61db98d68 100644
--- a/cms/djangoapps/contentstore/tests/test_video_utils.py
+++ b/cms/djangoapps/contentstore/tests/test_video_utils.py
@@ -49,7 +49,7 @@ def test_corrupt_image_file(self):
size=settings.VIDEO_IMAGE_SETTINGS['VIDEO_IMAGE_MIN_BYTES']
)
error = validate_video_image(uploaded_image_file)
- self.assertEqual(error, 'There is a problem with this image file. Try to upload a different file.') # noqa: PT009 # pylint: disable=line-too-long
+ self.assertEqual(error, 'There is a problem with this image file. Try to upload a different file.') # noqa: PT009
@ddt.ddt
@@ -214,7 +214,7 @@ def mocked_youtube_thumbnail_responses(resolutions):
mocked_responses = []
for resolution in YOUTUBE_THUMBNAIL_SIZES:
mocked_content = resolutions.get(resolution, '')
- error_response = False if mocked_content else True # lint-amnesty, pylint: disable=simplifiable-if-expression
+ error_response = False if mocked_content else True # pylint: disable=simplifiable-if-expression
mocked_responses.append(self.mocked_youtube_thumbnail_response(mocked_content, error_response))
return mocked_responses
@@ -320,14 +320,14 @@ def test_scrape_youtube_thumbnail_logging(
(
b'dummy-content',
None,
- 'This image file type is not supported. Supported file types are {supported_file_formats}.'.format( # noqa: UP032 # pylint: disable=line-too-long
+ 'This image file type is not supported. Supported file types are {supported_file_formats}.'.format( # noqa: UP032
supported_file_formats=list(settings.VIDEO_IMAGE_SUPPORTED_FILE_FORMATS.keys())
)
),
(
None,
None,
- 'This image file type is not supported. Supported file types are {supported_file_formats}.'.format( # noqa: UP032 # pylint: disable=line-too-long
+ 'This image file type is not supported. Supported file types are {supported_file_formats}.'.format( # noqa: UP032
supported_file_formats=list(settings.VIDEO_IMAGE_SUPPORTED_FILE_FORMATS.keys())
)
),
diff --git a/cms/djangoapps/contentstore/tests/test_xblock_handler_permissions.py b/cms/djangoapps/contentstore/tests/test_xblock_handler_permissions.py
index cc7b53ca0991..065092636039 100644
--- a/cms/djangoapps/contentstore/tests/test_xblock_handler_permissions.py
+++ b/cms/djangoapps/contentstore/tests/test_xblock_handler_permissions.py
@@ -30,7 +30,7 @@ def test_get_block_fields_staff_allowed(self):
self.assertEqual(self.client.get_json(f'/xblock/{self.html_block.location}').status_code, 200) # noqa: PT009
def test_get_block_fields_non_staff_forbidden(self):
- self.assertEqual(self.non_staff_client.get_json(f'/xblock/{self.html_block.location}').status_code, 403) # noqa: PT009 # pylint: disable=line-too-long
+ self.assertEqual(self.non_staff_client.get_json(f'/xblock/{self.html_block.location}').status_code, 403) # noqa: PT009
# --- POST /xblock/{blockId} metadata ---
diff --git a/cms/djangoapps/contentstore/toggles.py b/cms/djangoapps/contentstore/toggles.py
index 30a030f966a9..400e56fffbdd 100644
--- a/cms/djangoapps/contentstore/toggles.py
+++ b/cms/djangoapps/contentstore/toggles.py
@@ -125,7 +125,7 @@ def use_new_pdf_editor():
# .. toggle_name: new_core_editors.use_video_gallery_flow
# .. toggle_implementation: WaffleFlag
# .. toggle_default: False
-# .. toggle_description: This flag enables the use the video selection gallery on the flow of the new core video xblock editor
+# .. toggle_description: This flag enables the use the video selection gallery on the flow of the new core video xblock editor # noqa: E501
# .. toggle_use_cases: temporary
# .. toggle_creation_date: 2023-04-03
# .. toggle_target_removal_date: 2023-6-01
@@ -163,7 +163,7 @@ def individualize_anonymous_user_id(course_id):
# .. toggle_name: contentstore.use_react_markdown_editor
# .. toggle_implementation: CourseWaffleFlag
# .. toggle_default: False
-# .. toggle_description: This flag enables the use of the Markdown editor when creating or editing problems in the authoring MFE
+# .. toggle_description: This flag enables the use of the Markdown editor when creating or editing problems in the authoring MFE # noqa: E501
# .. toggle_use_cases: opt_in
# .. toggle_creation_date: 2025-4-11
# .. toggle_tickets: https://openedx.atlassian.net/wiki/spaces/OEPM/pages/4517232656/Re-enable+Markdown+editing+of+CAPA+problems+to+meet+various+use+cases
@@ -387,7 +387,7 @@ def use_new_group_configurations_page(course_key):
# .. toggle_name: contentstore.mock_video_uploads
# .. toggle_implementation: WaffleFlag
# .. toggle_default: False
-# .. toggle_description: This flag mocks contentstore video uploads for local development, if you don't have access to AWS
+# .. toggle_description: This flag mocks contentstore video uploads for local development, if you don't have access to AWS # noqa: E501
# .. toggle_use_cases: open_edx
# .. toggle_creation_date: 2023-7-25
# .. toggle_tickets: TNL-10897
@@ -544,7 +544,7 @@ def use_legacy_logged_out_home():
# .. toggle_name: contentstore.enable_course_optimizer_check_prev_run_links
# .. toggle_implementation: CourseWaffleFlag
# .. toggle_default: False
-# .. toggle_description: When enabled, allows the Course Optimizer to detect and update links pointing to previous course runs.
+# .. toggle_description: When enabled, allows the Course Optimizer to detect and update links pointing to previous course runs. # noqa: E501
# This feature enables instructors to fix internal course links that still point to old course runs
# after creating a course rerun.
# .. toggle_use_cases: temporary
diff --git a/cms/djangoapps/contentstore/transcript_storage_handlers.py b/cms/djangoapps/contentstore/transcript_storage_handlers.py
index 293475232c95..f60055e59429 100644
--- a/cms/djangoapps/contentstore/transcript_storage_handlers.py
+++ b/cms/djangoapps/contentstore/transcript_storage_handlers.py
@@ -64,7 +64,7 @@ def validate_transcript_credentials(provider, **credentials):
must_have_props = ['api_key', 'username']
missing = [
- must_have_prop for must_have_prop in must_have_props if must_have_prop not in list(credentials.keys()) # lint-amnesty, pylint: disable=consider-iterating-dictionary
+ must_have_prop for must_have_prop in must_have_props if must_have_prop not in list(credentials.keys()) # pylint: disable=consider-iterating-dictionary
]
if missing:
error_message = '{missing} must be specified.'.format(missing=' and '.join(missing))
@@ -233,7 +233,7 @@ def validate_transcript_upload_data(data, files):
data['language_code'] != data['new_language_code'] and
data['new_language_code'] in get_available_transcript_languages(video_id=data['edx_video_id'])
):
- error = _('A transcript with the "{language_code}" language code already exists.'.format( # lint-amnesty, pylint: disable=translation-of-non-string
+ error = _('A transcript with the "{language_code}" language code already exists.'.format( # pylint: disable=translation-of-non-string
language_code=data['new_language_code']
))
elif 'file' not in files:
diff --git a/cms/djangoapps/contentstore/utils.py b/cms/djangoapps/contentstore/utils.py
index 35818125efab..9ab864ab114c 100644
--- a/cms/djangoapps/contentstore/utils.py
+++ b/cms/djangoapps/contentstore/utils.py
@@ -599,7 +599,7 @@ def is_currently_visible_to_students(xblock):
return False
# Check start date
- if 'detached' not in published._class_tags and published.start is not None: # lint-amnesty, pylint: disable=protected-access
+ if 'detached' not in published._class_tags and published.start is not None: # pylint: disable=protected-access
return datetime.now(UTC) > published.start
# No start date, so it's always visible
@@ -996,7 +996,7 @@ def get_subsections_in_section():
section_subsections = section.get_children()
return section_subsections
except AttributeError:
- log.error("URL Retrieval Error: subsection {subsection} included in section {section}".format( # noqa: UP032 # pylint: disable=line-too-long
+ log.error("URL Retrieval Error: subsection {subsection} included in section {section}".format( # noqa: UP032
section=section.location,
subsection=subsection.location
))
@@ -1494,7 +1494,7 @@ def get_course_settings(request, course_key, course_block):
# if 'minimum_grade_credit' of a course is not set or 0 then
# show warning message to course author.
- show_min_grade_warning = False if course_block.minimum_grade_credit > 0 else True # lint-amnesty, pylint: disable=simplifiable-if-expression
+ show_min_grade_warning = False if course_block.minimum_grade_credit > 0 else True # pylint: disable=simplifiable-if-expression
settings_context.update(
{
'is_credit_course': True,
@@ -1950,7 +1950,7 @@ def _get_course_index_context(request, course_key, course_block):
'lms_link': lms_link,
'sections': sections,
'course_structure': course_structure,
- 'initial_state': course_outline_initial_state(locator_to_show, course_structure) if locator_to_show else None, # lint-amnesty, pylint: disable=line-too-long
+ 'initial_state': course_outline_initial_state(locator_to_show, course_structure) if locator_to_show else None,
'initial_user_clipboard': user_clipboard,
'rerun_notification_id': current_action.id if current_action else None,
'course_release_date': course_release_date,
diff --git a/cms/djangoapps/contentstore/video_utils.py b/cms/djangoapps/contentstore/video_utils.py
index 44e216947117..85cf0cd16fe3 100644
--- a/cms/djangoapps/contentstore/video_utils.py
+++ b/cms/djangoapps/contentstore/video_utils.py
@@ -87,7 +87,7 @@ def download_youtube_video_thumbnail(youtube_id):
thumbnail_content = thumbnail_content_type = None
# Download highest resolution thumbnail available.
for thumbnail_quality in YOUTUBE_THUMBNAIL_SIZES:
- thumbnail_url = urljoin('https://img.youtube.com', '/vi/{youtube_id}/{thumbnail_quality}.jpg'.format( # noqa: UP032 # pylint: disable=line-too-long
+ thumbnail_url = urljoin('https://img.youtube.com', '/vi/{youtube_id}/{thumbnail_quality}.jpg'.format( # noqa: UP032
youtube_id=youtube_id, thumbnail_quality=thumbnail_quality
))
response = requests.get(thumbnail_url)
@@ -115,7 +115,7 @@ def validate_and_update_video_image(course_key_string, edx_video_id, image_file,
update_video_image(edx_video_id, course_key_string, image_file, image_filename)
LOGGER.info(
- 'VIDEOS: Scraping youtube video thumbnail for edx_video_id [%s] in course [%s]', edx_video_id, course_key_string # lint-amnesty, pylint: disable=line-too-long
+ 'VIDEOS: Scraping youtube video thumbnail for edx_video_id [%s] in course [%s]', edx_video_id, course_key_string
)
diff --git a/cms/djangoapps/contentstore/views/certificate_manager.py b/cms/djangoapps/contentstore/views/certificate_manager.py
index dda1e172c503..b53c93565612 100644
--- a/cms/djangoapps/contentstore/views/certificate_manager.py
+++ b/cms/djangoapps/contentstore/views/certificate_manager.py
@@ -88,7 +88,7 @@ def parse(json_string):
try:
certificate = json.loads(json_string)
except ValueError:
- raise CertificateValidationError(_("invalid JSON")) # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904
+ raise CertificateValidationError(_("invalid JSON")) # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904, E501
# Include the data contract version
certificate["version"] = CERTIFICATE_SCHEMA_VERSION
# Ensure a signatories list is always returned
diff --git a/cms/djangoapps/contentstore/views/component.py b/cms/djangoapps/contentstore/views/component.py
index 9fa38665466f..a5f2125e71bc 100644
--- a/cms/djangoapps/contentstore/views/component.py
+++ b/cms/djangoapps/contentstore/views/component.py
@@ -350,7 +350,7 @@ def create_support_legend_dict():
templates_for_category.append(
create_template_dict(
- _(template['metadata'].get('display_name')), # lint-amnesty, pylint: disable=translation-of-non-string
+ _(template['metadata'].get('display_name')), # pylint: disable=translation-of-non-string
category,
support_level_with_template,
template_id,
diff --git a/cms/djangoapps/contentstore/views/course.py b/cms/djangoapps/contentstore/views/course.py
index 3d248944bdd5..4ad82865565b 100644
--- a/cms/djangoapps/contentstore/views/course.py
+++ b/cms/djangoapps/contentstore/views/course.py
@@ -1346,7 +1346,7 @@ def course_info_update_handler(request, course_key_string, provided_id=None):
elif request.method == 'DELETE':
try:
return JsonResponse(delete_course_update(usage_key, request.json, provided_id, request.user))
- except: # lint-amnesty, pylint: disable=bare-except
+ except: # noqa: E722
return HttpResponseBadRequest(
"Failed to delete",
content_type="text/plain"
@@ -1357,7 +1357,7 @@ def course_info_update_handler(request, course_key_string, provided_id=None):
return JsonResponse(update_course_updates(
usage_key, request.json, provided_id, request.user, request.method
))
- except: # lint-amnesty, pylint: disable=bare-except
+ except: # noqa: E722
return HttpResponseBadRequest(
"Failed to save",
content_type="text/plain"
@@ -1639,7 +1639,7 @@ def validate_textbook_json(textbook):
try:
textbook = json.loads(textbook)
except ValueError:
- raise TextbookValidationError("invalid JSON") # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904
+ raise TextbookValidationError("invalid JSON") # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904, E501
if not isinstance(textbook, dict):
raise TextbookValidationError("must be JSON object")
if not textbook.get("tab_title"):
@@ -1923,7 +1923,7 @@ def group_configurations_detail_handler(request, course_key_string, group_config
if request.method in ('POST', 'PUT'): # can be either and sometimes django is rewriting one to the other
try:
- new_configuration = GroupConfiguration(request.body, course, group_configuration_id).get_user_partition() # lint-amnesty, pylint: disable=line-too-long
+ new_configuration = GroupConfiguration(request.body, course, group_configuration_id).get_user_partition() # noqa: E501
except GroupConfigurationsValidationError as err:
return JsonResponse({"error": str(err)}, status=400)
diff --git a/cms/djangoapps/contentstore/views/error.py b/cms/djangoapps/contentstore/views/error.py
index 5a9c23490ba6..ed0db0af62bb 100644
--- a/cms/djangoapps/contentstore/views/error.py
+++ b/cms/djangoapps/contentstore/views/error.py
@@ -20,7 +20,7 @@ def outer(func):
def inner(request, *args, **kwargs):
if request.headers.get('x-requested-with') == 'XMLHttpRequest':
content = dump_js_escaped_json({"error": message})
- return HttpResponse(content, content_type="application/json", # lint-amnesty, pylint: disable=http-response-with-content-type-json
+ return HttpResponse(content, content_type="application/json", # pylint: disable=http-response-with-content-type-json
status=status)
else:
return func(request, *args, **kwargs)
diff --git a/cms/djangoapps/contentstore/views/organization.py b/cms/djangoapps/contentstore/views/organization.py
index 7ece98201ac1..c9c9eaa60966 100644
--- a/cms/djangoapps/contentstore/views/organization.py
+++ b/cms/djangoapps/contentstore/views/organization.py
@@ -22,4 +22,4 @@ def get(self, request, *args, **kwargs): # lint-amnesty, pylint: disable=unused
"""Returns organization list as json."""
organizations = get_organizations()
org_names_list = [(org["short_name"]) for org in organizations]
- return HttpResponse(dump_js_escaped_json(org_names_list), content_type='application/json; charset=utf-8') # lint-amnesty, pylint: disable=http-response-with-content-type-json
+ return HttpResponse(dump_js_escaped_json(org_names_list), content_type='application/json; charset=utf-8') # pylint: disable=http-response-with-content-type-json
diff --git a/cms/djangoapps/contentstore/views/preview.py b/cms/djangoapps/contentstore/views/preview.py
index d3ca840c01fd..45b0298601af 100644
--- a/cms/djangoapps/contentstore/views/preview.py
+++ b/cms/djangoapps/contentstore/views/preview.py
@@ -93,7 +93,7 @@ def preview_handler(request, usage_key_string, handler, suffix=''):
return webob_to_django_response(resp)
-def handler_url(block, handler_name, suffix='', query='', thirdparty=False): # lint-amnesty, pylint: disable=unused-argument
+def handler_url(block, handler_name, suffix='', query='', thirdparty=False): # pylint: disable=unused-argument
"""
Handler URL function for Preview
"""
@@ -312,7 +312,7 @@ def _studio_wrap_xblock(xblock, view, frag, context, display_name_only=False):
is_reorderable = _is_xblock_reorderable(xblock, context)
selected_groups_label = get_visibility_partition_info(xblock)['selected_groups_label']
if selected_groups_label:
- selected_groups_label = _('Access restricted to: {list_of_groups}').format(list_of_groups=selected_groups_label) # lint-amnesty, pylint: disable=line-too-long
+ selected_groups_label = _('Access restricted to: {list_of_groups}').format(list_of_groups=selected_groups_label) # noqa: E501
course = modulestore().get_course(xblock.location.course_key)
can_edit = context.get('can_edit', True)
diff --git a/cms/djangoapps/contentstore/views/tabs.py b/cms/djangoapps/contentstore/views/tabs.py
index 86a725bcfc78..ba0334d1caf4 100644
--- a/cms/djangoapps/contentstore/views/tabs.py
+++ b/cms/djangoapps/contentstore/views/tabs.py
@@ -179,7 +179,7 @@ def edit_tab_handler(course_item: CourseBlock, tabs_data: Dict, user: User): #
raise NotImplementedError(f"Unsupported request to edit tab: {tabs_data}")
-def get_tab_by_tab_id_locator(tab_list: List[CourseTab], tab_id_locator: Dict[str, str]) -> Optional[CourseTab]: # noqa: UP006, UP045 # pylint: disable=line-too-long
+def get_tab_by_tab_id_locator(tab_list: List[CourseTab], tab_id_locator: Dict[str, str]) -> Optional[CourseTab]: # noqa: UP006, UP045
"""
Look for a tab with the specified tab_id or locator. Returns the first matching tab.
"""
@@ -191,7 +191,7 @@ def get_tab_by_tab_id_locator(tab_list: List[CourseTab], tab_id_locator: Dict[st
return tab
-def get_tab_by_locator(tab_list: List[CourseTab], tab_location: Union[str, UsageKey]) -> Optional[CourseTab]: # noqa: UP006, UP007, UP045 # pylint: disable=line-too-long
+def get_tab_by_locator(tab_list: List[CourseTab], tab_location: Union[str, UsageKey]) -> Optional[CourseTab]: # noqa: UP006, UP007, UP045
"""
Look for a tab with the specified locator. Returns the first matching tab.
"""
diff --git a/cms/djangoapps/contentstore/views/tests/test_assets.py b/cms/djangoapps/contentstore/views/tests/test_assets.py
index 4601f27f05f0..99825f6f24e5 100644
--- a/cms/djangoapps/contentstore/views/tests/test_assets.py
+++ b/cms/djangoapps/contentstore/views/tests/test_assets.py
@@ -447,10 +447,10 @@ def test_basic(self):
output["external_url"], "https://lms_root_url/asset-v1:org+class+run+type@asset+block@my_file_name.jpg"
)
self.assertEqual(output["portable_url"], "/static/my_file_name.jpg") # noqa: PT009
- self.assertEqual(output["thumbnail"], "/asset-v1:org+class+run+type@thumbnail+block@my_file_name_thumb.jpg") # noqa: PT009 # pylint: disable=line-too-long
+ self.assertEqual(output["thumbnail"], "/asset-v1:org+class+run+type@thumbnail+block@my_file_name_thumb.jpg") # noqa: PT009
self.assertEqual(output["id"], str(location)) # noqa: PT009
self.assertEqual(output['locked'], True) # noqa: PT009
- self.assertEqual(output['static_full_url'], '/asset-v1:org+class+run+type@asset+block@my_file_name.jpg') # noqa: PT009 # pylint: disable=line-too-long
+ self.assertEqual(output['static_full_url'], '/asset-v1:org+class+run+type@asset+block@my_file_name.jpg') # noqa: PT009
output = assets._get_asset_json("name", content_type, upload_date, location, None, False, course_key)
self.assertIsNone(output["thumbnail"]) # noqa: PT009
diff --git a/cms/djangoapps/contentstore/views/tests/test_block.py b/cms/djangoapps/contentstore/views/tests/test_block.py
index bb1206169189..1a75fcd25e6a 100644
--- a/cms/djangoapps/contentstore/views/tests/test_block.py
+++ b/cms/djangoapps/contentstore/views/tests/test_block.py
@@ -2212,7 +2212,7 @@ def _make_draft_content_different_from_published(self):
published = modulestore().get_item(
self.problem_usage_key,
revision=ModuleStoreEnum.RevisionOption.published_only,
- ) # lint-amnesty, pylint: disable=line-too-long
+ )
# Update the draft version and check that published is different.
self.client.ajax_post(
@@ -2940,7 +2940,7 @@ def test_advanced_components(self):
# Now fully disable done through XBlockConfiguration
XBlockConfiguration.objects.create(name="done", enabled=False)
self.templates = get_component_templates(self.course)
- self.assertTrue((not any(item.get("category") == "done" for item in self.get_templates_of_type("advanced")))) # noqa: PT009, UP034 # pylint: disable=line-too-long
+ self.assertTrue((not any(item.get("category") == "done" for item in self.get_templates_of_type("advanced")))) # noqa: PT009, UP034
def test_deprecated_no_advance_component_button(self):
"""
@@ -4613,5 +4613,5 @@ def test_xblock_edit_view_contains_resources(self):
resource_links = [link["href"] for link in soup.find_all("link", {"rel": "stylesheet"})]
script_sources = [script["src"] for script in soup.find_all("script") if script.get("src")]
- self.assertGreater(len(resource_links), 0, f"No CSS resources found in HTML. Found: {resource_links}") # noqa: PT009 # pylint: disable=line-too-long
- self.assertGreater(len(script_sources), 0, f"No JS resources found in HTML. Found: {script_sources}") # noqa: PT009 # pylint: disable=line-too-long
+ self.assertGreater(len(resource_links), 0, f"No CSS resources found in HTML. Found: {resource_links}") # noqa: PT009
+ self.assertGreater(len(script_sources), 0, f"No JS resources found in HTML. Found: {script_sources}") # noqa: PT009
diff --git a/cms/djangoapps/contentstore/views/tests/test_course_updates.py b/cms/djangoapps/contentstore/views/tests/test_course_updates.py
index 36c4e45c56c7..9c2328b83dae 100644
--- a/cms/djangoapps/contentstore/views/tests/test_course_updates.py
+++ b/cms/djangoapps/contentstore/views/tests/test_course_updates.py
@@ -42,7 +42,7 @@ def get_response(content, date):
return json.loads(resp.content.decode('utf-8'))
- init_content = 'VIDEO '
payload = get_response(content, 'January 8, 2013')
self.assertHTMLEqual(payload['content'], content)
@@ -172,13 +172,13 @@ def test_course_updates_compatibility(self):
)
self.assertHTMLEqual(update_content, json.loads(resp.content.decode('utf-8'))['content'])
course_updates = modulestore().get_item(location)
- self.assertEqual(course_updates.items, [{'date': update_date, 'content': update_content, 'id': 1}]) # noqa: PT009 # pylint: disable=line-too-long
+ self.assertEqual(course_updates.items, [{'date': update_date, 'content': update_content, 'id': 1}]) # noqa: PT009
# course_updates 'data' field should not update automatically
self.assertEqual(course_updates.data, '') # noqa: PT009
# test delete course update item (soft delete)
course_updates = modulestore().get_item(location)
- self.assertEqual(course_updates.items, [{'date': update_date, 'content': update_content, 'id': 1}]) # noqa: PT009 # pylint: disable=line-too-long
+ self.assertEqual(course_updates.items, [{'date': update_date, 'content': update_content, 'id': 1}]) # noqa: PT009
# now try to delete first update item
resp = self.client.delete(course_update_url + '1')
self.assertEqual(json.loads(resp.content.decode('utf-8')), []) # noqa: PT009
@@ -220,7 +220,7 @@ def test_no_ol_course_update(self):
course_updates.data = 'bad news'
modulestore().update_item(course_updates, self.user.id)
- init_content = 'VIDEO '
payload = {'content': content, 'date': 'January 8, 2013'}
@@ -316,7 +316,7 @@ def test_course_update_id(self):
self.assertHTMLEqual(update_content, json.loads(resp.content.decode('utf-8'))['content'])
course_updates = modulestore().get_item(updates_location)
del course_updates.items[0]["status"]
- self.assertEqual(course_updates.items, [{'date': update_date, 'content': update_content, 'id': 2}]) # noqa: PT009 # pylint: disable=line-too-long
+ self.assertEqual(course_updates.items, [{'date': update_date, 'content': update_content, 'id': 2}]) # noqa: PT009
class CourseUpdateAuthzTest(CourseAuthzTestMixin, CourseTestCase):
diff --git a/cms/djangoapps/contentstore/views/tests/test_group_configurations.py b/cms/djangoapps/contentstore/views/tests/test_group_configurations.py
index 83c20f3c4fbb..d4745eb75187 100644
--- a/cms/djangoapps/contentstore/views/tests/test_group_configurations.py
+++ b/cms/djangoapps/contentstore/views/tests/test_group_configurations.py
@@ -282,7 +282,7 @@ def test_view_index_ok(self):
# This creates a random UserPartition.
self.course.user_partitions = [
- UserPartition(0, 'First name', 'First description', [Group(0, 'Group A'), Group(1, 'Group B'), Group(2, 'Group C')]), # lint-amnesty, pylint: disable=line-too-long
+ UserPartition(0, 'First name', 'First description', [Group(0, 'Group A'), Group(1, 'Group B'), Group(2, 'Group C')]), # noqa: E501
]
self.save_course()
@@ -881,7 +881,7 @@ def test_can_get_correct_usage_info_for_split_test(self):
self.store.update_item(self.course, ModuleStoreEnum.UserID.test)
self.reload_course()
- __, split_test, problem = self._create_content_experiment(cid=0, name_suffix='0', group_id=3, cid_for_problem=1) # lint-amnesty, pylint: disable=unused-variable
+ __, split_test, problem = self._create_content_experiment(cid=0, name_suffix='0', group_id=3, cid_for_problem=1) # pylint: disable=unused-variable
expected = {
'id': 1,
diff --git a/cms/djangoapps/contentstore/views/tests/test_helpers.py b/cms/djangoapps/contentstore/views/tests/test_helpers.py
index 2f7f092b2f58..84b36c8a5af9 100644
--- a/cms/djangoapps/contentstore/views/tests/test_helpers.py
+++ b/cms/djangoapps/contentstore/views/tests/test_helpers.py
@@ -56,7 +56,7 @@ def test_xblock_studio_url(self):
display_name="My Video")
self.assertIsNone(xblock_studio_url(video)) # noqa: PT009
# Verify video URL with find_parent=True
- self.assertEqual(xblock_studio_url(video, find_parent=True), f'/container/{child_vertical.location}') # noqa: PT009 # pylint: disable=line-too-long
+ self.assertEqual(xblock_studio_url(video, find_parent=True), f'/container/{child_vertical.location}') # noqa: PT009
# Verify library URL
library = LibraryFactory.create()
@@ -99,7 +99,7 @@ def test_xblock_embed_lms_url(self, mock_get_value: Mock):
sequential = BlockFactory.create(
parent_location=chapter.location, category='sequential', display_name="Lesson 1"
)
- self.assertEqual(xblock_embed_lms_url(sequential), f"lms.example.com/xblock/{sequential.location}") # noqa: PT009 # pylint: disable=line-too-long
+ self.assertEqual(xblock_embed_lms_url(sequential), f"lms.example.com/xblock/{sequential.location}") # noqa: PT009
def test_xblock_type_display_name(self):
diff --git a/cms/djangoapps/contentstore/views/tests/test_import_export.py b/cms/djangoapps/contentstore/views/tests/test_import_export.py
index b363faa57174..efad389b528b 100644
--- a/cms/djangoapps/contentstore/views/tests/test_import_export.py
+++ b/cms/djangoapps/contentstore/views/tests/test_import_export.py
@@ -1186,7 +1186,7 @@ def assert_problem_display_names(self, source_course_location, dest_course_locat
self.assertEqual(len(source_course_lib_children), len(dest_course_lib_children)) # noqa: PT009
- for source_child_location, dest_child_location in zip(source_course_lib_children, dest_course_lib_children): # noqa: B905 # pylint: disable=line-too-long
+ for source_child_location, dest_child_location in zip(source_course_lib_children, dest_course_lib_children): # noqa: B905
# Assert problem names on draft branch.
with self.store.branch_setting(branch_setting=ModuleStoreEnum.Branch.draft_preferred):
self.assert_names(source_child_location, dest_child_location)
diff --git a/cms/djangoapps/contentstore/views/tests/test_transcripts.py b/cms/djangoapps/contentstore/views/tests/test_transcripts.py
index 902f70637fb0..7fa9a5ed9b7e 100644
--- a/cms/djangoapps/contentstore/views/tests/test_transcripts.py
+++ b/cms/djangoapps/contentstore/views/tests/test_transcripts.py
@@ -202,7 +202,7 @@ def create_transcript_file(self, content, suffix, include_bom=False):
"""
Setup a transcript file with suffix and content.
"""
- transcript_file = tempfile.NamedTemporaryFile(suffix=suffix) # lint-amnesty, pylint: disable=consider-using-with
+ transcript_file = tempfile.NamedTemporaryFile(suffix=suffix) # pylint: disable=consider-using-with
wrapped_content = textwrap.dedent(content)
if include_bom:
wrapped_content = wrapped_content.encode('utf-8-sig')
@@ -1044,7 +1044,7 @@ def test_fail_data_without_id(self):
}
resp = self.client.get(link, {'data': json.dumps(data)})
self.assertEqual(resp.status_code, 400) # noqa: PT009
- self.assertEqual(json.loads(resp.content.decode('utf-8')).get('status'), "Can't find item by locator.") # noqa: PT009 # pylint: disable=line-too-long
+ self.assertEqual(json.loads(resp.content.decode('utf-8')).get('status'), "Can't find item by locator.") # noqa: PT009
def test_fail_data_with_bad_locator(self):
# Test for raising `InvalidLocationError` exception.
@@ -1059,7 +1059,7 @@ def test_fail_data_with_bad_locator(self):
}
resp = self.client.get(link, {'data': json.dumps(data)})
self.assertEqual(resp.status_code, 400) # noqa: PT009
- self.assertEqual(json.loads(resp.content.decode('utf-8')).get('status'), "Can't find item by locator.") # noqa: PT009 # pylint: disable=line-too-long
+ self.assertEqual(json.loads(resp.content.decode('utf-8')).get('status'), "Can't find item by locator.") # noqa: PT009
# Test for raising `ItemNotFoundError` exception.
data = {
@@ -1072,7 +1072,7 @@ def test_fail_data_with_bad_locator(self):
}
resp = self.client.get(link, {'data': json.dumps(data)})
self.assertEqual(resp.status_code, 400) # noqa: PT009
- self.assertEqual(json.loads(resp.content.decode('utf-8')).get('status'), "Can't find item by locator.") # noqa: PT009 # pylint: disable=line-too-long
+ self.assertEqual(json.loads(resp.content.decode('utf-8')).get('status'), "Can't find item by locator.") # noqa: PT009
def test_fail_for_non_video_block(self):
# Not video block: setup
diff --git a/cms/djangoapps/contentstore/views/tests/test_unit_page.py b/cms/djangoapps/contentstore/views/tests/test_unit_page.py
index c79a54f52619..7e2365f3a5b1 100644
--- a/cms/djangoapps/contentstore/views/tests/test_unit_page.py
+++ b/cms/djangoapps/contentstore/views/tests/test_unit_page.py
@@ -27,7 +27,7 @@ def test_public_component_preview_html(self):
"""
Verify that a public xblock's preview returns the expected HTML.
"""
- published_video = self.store.publish(self.video.location, self.user.id) # lint-amnesty, pylint: disable=unused-variable # noqa: F841
+ published_video = self.store.publish(self.video.location, self.user.id) # pylint: disable=unused-variable # noqa: F841
self.validate_preview_html(self.video, STUDENT_VIEW, in_unit=True, can_add=False)
def test_draft_component_preview_html(self):
diff --git a/cms/djangoapps/contentstore/views/tests/test_videos.py b/cms/djangoapps/contentstore/views/tests/test_videos.py
index 75948340bae0..1091a0107cf5 100644
--- a/cms/djangoapps/contentstore/views/tests/test_videos.py
+++ b/cms/djangoapps/contentstore/views/tests/test_videos.py
@@ -1,1759 +1,1759 @@
-"""
-Unit tests for video-related REST APIs.
-"""
-
-
-import csv
-import json
-import re
-from contextlib import contextmanager
-from datetime import datetime
-from io import StringIO
-from unittest.mock import Mock, patch
-
-import dateutil.parser
-import ddt
-import pytz
-from django.conf import settings
-from django.test import TestCase
-from django.test.utils import override_settings
-from django.urls import reverse
-from edx_toggles.toggles.testutils import override_waffle_flag, override_waffle_switch
-from edxval.api import (
- create_or_update_transcript_preferences,
- create_or_update_video_transcript,
- create_profile,
- create_video,
- get_course_video_image_url,
- get_transcript_preferences,
- get_video_info,
-)
-
-from cms.djangoapps.contentstore.models import VideoUploadConfig
-from cms.djangoapps.contentstore.tests.utils import CourseTestCase
-from cms.djangoapps.contentstore.utils import reverse_course_url
-from cms.djangoapps.contentstore.video_storage_handlers import (
- PUBLIC_VIDEO_SHARE,
- StatusDisplayStrings,
- TranscriptProvider,
- convert_video_status,
- storage_service_bucket,
- storage_service_key,
-)
-from common.djangoapps.student.tests.factories import UserFactory
-from openedx.core.djangoapps.profile_images.tests.helpers import make_image_file
-from openedx.core.djangoapps.video_pipeline.config.waffle import DEPRECATE_YOUTUBE, ENABLE_DEVSTACK_VIDEO_UPLOADS
-from openedx.core.djangoapps.waffle_utils.models import WaffleFlagCourseOverrideModel
-from xmodule.modulestore.django import modulestore
-from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
-from xmodule.modulestore.tests.factories import CourseFactory # lint-amnesty, pylint: disable=wrong-import-order
-
-from ..videos import KEY_EXPIRATION_IN_SECONDS, VIDEO_IMAGE_UPLOAD_ENABLED
-
-
-def setup_s3_mocks(mock_boto3_resource, bucket_name='test-bucket'):
- """
- Helper function to set up consistent boto3 S3 mocks.
-
- Args:
- mock_boto3_resource: The patched boto3.resource mock
- bucket_name: Name for the mock bucket (default: 'test-bucket')
-
- Returns:
- tuple: (mock_s3_client, mock_bucket, mock_s3_resource)
- """
- mock_s3_client = Mock()
- mock_bucket = Mock()
- mock_bucket.name = bucket_name
- mock_bucket.meta.client = mock_s3_client
- mock_s3_resource = Mock()
- mock_s3_resource.Bucket.return_value = mock_bucket
- mock_boto3_resource.return_value = mock_s3_resource
- return mock_s3_client, mock_bucket, mock_s3_resource
-
-
-class VideoUploadTestBase:
- """
- Test cases for the video upload feature
- """
-
- def get_url_for_course_key(self, course_key, kwargs=None):
- """Return video handler URL for the given course"""
- return reverse_course_url(self.VIEW_NAME, course_key, kwargs) # lint-amnesty, pylint: disable=no-member
-
- def setUp(self):
- super().setUp() # lint-amnesty, pylint: disable=no-member
- self.url = self.get_url_for_course_key(self.course.id)
- self.test_token = "test_token"
- self.course.video_upload_pipeline = {
- "course_video_upload_token": self.test_token,
- }
- self.save_course() # lint-amnesty, pylint: disable=no-member
-
- # create another course for videos belonging to multiple courses
- self.course2 = CourseFactory.create()
- self.course2.video_upload_pipeline = {
- "course_video_upload_token": self.test_token,
- }
- self.course2.save()
- self.store.update_item(self.course2, self.user.id) # lint-amnesty, pylint: disable=no-member
-
- # course ids for videos
- course_ids = [str(self.course.id), str(self.course2.id)]
- created = datetime.now(pytz.utc)
-
- self.profiles = ["profile1", "profile2"]
- self.previous_uploads = [
- {
- "edx_video_id": "test1",
- "client_video_id": "test1.mp4",
- "duration": 42.0,
- "status": "upload",
- "courses": course_ids,
- "encoded_videos": [],
- "created": created
- },
- {
- "edx_video_id": "test2",
- "client_video_id": "test2.mp4",
- "duration": 128.0,
- "status": "file_complete",
- "courses": course_ids,
- "created": created,
- "encoded_videos": [
- {
- "profile": "profile1",
- "url": "http://example.com/profile1/test2.mp4",
- "file_size": 1600,
- "bitrate": 100,
- },
- {
- "profile": "profile2",
- "url": "http://example.com/profile2/test2.mov",
- "file_size": 16000,
- "bitrate": 1000,
- },
- ],
- },
- {
- "edx_video_id": "non-ascii",
- "client_video_id": "nón-ascii-näme.mp4",
- "duration": 256.0,
- "status": "transcode_active",
- "courses": course_ids,
- "created": created,
- "encoded_videos": [
- {
- "profile": "profile1",
- "url": "http://example.com/profile1/nón-ascii-näme.mp4",
- "file_size": 3200,
- "bitrate": 100,
- },
- ]
- },
- ]
- # Ensure every status string is tested
- self.previous_uploads += [
- {
- "edx_video_id": f"status_test_{status}",
- "client_video_id": "status_test.mp4",
- "duration": 3.14,
- "status": status,
- "courses": course_ids,
- "created": created,
- "encoded_videos": [],
- }
- for status in (
- list(StatusDisplayStrings._STATUS_MAP.keys()) + # pylint:disable=protected-access
- ["non_existent_status"]
- )
- ]
- for profile in self.profiles:
- create_profile(profile)
- for video in self.previous_uploads:
- create_video(video)
-
- def _get_previous_upload(self, edx_video_id):
- """Returns the previous upload with the given video id."""
- return next(
- video
- for video in self.previous_uploads
- if video["edx_video_id"] == edx_video_id
- )
-
-
-class VideoStudioAccessTestsMixin:
- """
- Base Access tests for studio video views
- """
- def test_anon_user(self):
- self.client.logout()
- response = self.client.get(self.url)
- self.assertEqual(response.status_code, 302) # noqa: PT009
-
- def test_put(self):
- response = self.client.put(self.url)
- self.assertEqual(response.status_code, 405) # noqa: PT009
-
- def test_invalid_course_key(self):
- response = self.client.get(
- self.get_url_for_course_key("Non/Existent/Course")
- )
- self.assertEqual(response.status_code, 404) # noqa: PT009
-
- def test_non_staff_user(self):
- client, __ = self.create_non_staff_authed_user_client()
- response = client.get(self.url)
- self.assertEqual(response.status_code, 403) # noqa: PT009
-
-
-class VideoPipelineStudioAccessTestsMixin:
- """
- Access tests for video views that rely on the video pipeline
- """
- def test_video_pipeline_not_enabled(self):
- settings.FEATURES["ENABLE_VIDEO_UPLOAD_PIPELINE"] = False
- self.assertEqual(self.client.get(self.url).status_code, 404) # noqa: PT009
-
- def test_video_pipeline_not_configured(self):
- settings.VIDEO_UPLOAD_PIPELINE = None
- self.assertEqual(self.client.get(self.url).status_code, 404) # noqa: PT009
-
- def test_course_not_configured(self):
- self.course.video_upload_pipeline = {}
- self.save_course()
- self.assertEqual(self.client.get(self.url).status_code, 404) # noqa: PT009
-
-
-class VideoUploadPostTestsMixin:
- """
- Shared test cases for video post tests.
- """
- @override_settings(AWS_ACCESS_KEY_ID='test_key_id', AWS_SECRET_ACCESS_KEY='test_secret')
- @patch('cms.djangoapps.contentstore.video_storage_handlers.boto3.resource')
- def test_post_success(self, mock_boto3_resource):
- files = [
- {
- 'file_name': 'first.mp4',
- 'content_type': 'video/mp4',
- },
- {
- 'file_name': 'second.mp4',
- 'content_type': 'video/mp4',
- },
- {
- 'file_name': 'third.mov',
- 'content_type': 'video/quicktime',
- },
- {
- 'file_name': 'fourth.mp4',
- 'content_type': 'video/mp4',
- },
- ]
-
- # Setup boto3 mocks
- mock_s3_client, mock_bucket, mock_s3_resource = setup_s3_mocks(mock_boto3_resource)
-
- # Mock generate_presigned_url to return different URLs for each file
- def mock_generate_presigned_url(operation, Params=None, ExpiresIn=None):
- file_name = Params['Metadata']['client_video_id']
- return f'http://example.com/url_{file_name}'
-
- mock_s3_client.generate_presigned_url.side_effect = mock_generate_presigned_url
-
- response = self.client.post(
- self.url,
- json.dumps({'files': files}),
- content_type='application/json'
- )
- self.assertEqual(response.status_code, 200) # noqa: PT009
- response_obj = json.loads(response.content.decode('utf-8'))
-
- # Verify boto3 resource was called correctly
- mock_boto3_resource.assert_called_once_with(
- "s3",
- aws_access_key_id=settings.AWS_ACCESS_KEY_ID,
- aws_secret_access_key=settings.AWS_SECRET_ACCESS_KEY
- )
-
- self.assertEqual(len(response_obj['files']), len(files)) # noqa: PT009
- self.assertEqual(mock_s3_client.generate_presigned_url.call_count, len(files)) # noqa: PT009
-
- for i, file_info in enumerate(files):
- # Get the call args for this file's presigned URL generation
- call_args = mock_s3_client.generate_presigned_url.call_args_list[i]
- args, kwargs = call_args
-
- # Verify the operation and params
- self.assertEqual(args[0], 'put_object') # noqa: PT009
- self.assertEqual(kwargs['Params']['Bucket'], 'test-bucket') # noqa: PT009
- self.assertEqual(kwargs['Params']['ContentType'], file_info['content_type']) # noqa: PT009
- self.assertEqual(kwargs['ExpiresIn'], KEY_EXPIRATION_IN_SECONDS) # noqa: PT009
-
- # Extract video_id from the key
- key_name = kwargs['Params']['Key']
- path_match = re.match(
- (
- settings.VIDEO_UPLOAD_PIPELINE['ROOT_PATH'] +
- '/([a-f0-9]{8}-[a-f0-9]{4}-4[a-f0-9]{3}-[89ab][a-f0-9]{3}-[a-f0-9]{12})$'
- ),
- key_name
- )
- self.assertIsNotNone(path_match) # noqa: PT009
- video_id = path_match.group(1)
-
- # Verify metadata
- metadata = kwargs['Params']['Metadata']
- self.assertEqual(metadata['course_video_upload_token'], self.test_token) # noqa: PT009
- self.assertEqual(metadata['client_video_id'], file_info['file_name']) # noqa: PT009
- self.assertEqual(metadata['course_key'], str(self.course.id)) # noqa: PT009
-
- # Ensure VAL was updated
- val_info = get_video_info(video_id)
- self.assertEqual(val_info['status'], 'upload') # noqa: PT009
- self.assertEqual(val_info['client_video_id'], file_info['file_name']) # noqa: PT009
- self.assertEqual(val_info['duration'], 0) # noqa: PT009
- self.assertEqual(val_info['courses'], [{str(self.course.id): None}]) # noqa: PT009
-
- # Ensure response is correct
- response_file = response_obj['files'][i]
- self.assertEqual(response_file['file_name'], file_info['file_name']) # noqa: PT009
- self.assertEqual(response_file['upload_url'], f'http://example.com/url_{file_info["file_name"]}') # noqa: PT009 # pylint: disable=line-too-long
-
- def test_post_non_json(self):
- response = self.client.post(self.url, {"files": []})
- self.assertEqual(response.status_code, 400) # noqa: PT009
-
- def test_post_malformed_json(self):
- response = self.client.post(self.url, "{", content_type="application/json")
- self.assertEqual(response.status_code, 400) # noqa: PT009
-
- def test_post_invalid_json(self):
- def assert_bad(content):
- """Make request with content and assert that response is 400"""
- response = self.client.post(
- self.url,
- json.dumps(content),
- content_type="application/json"
- )
- self.assertEqual(response.status_code, 400) # noqa: PT009
-
- # Top level missing files key
- assert_bad({})
-
- # Entry missing file_name
- assert_bad({"files": [{"content_type": "video/mp4"}]})
-
- # Entry missing content_type
- assert_bad({"files": [{"file_name": "test.mp4"}]})
-
-
-@ddt.ddt
-@patch.dict("django.conf.settings.FEATURES", {"ENABLE_VIDEO_UPLOAD_PIPELINE": True})
-@override_settings(VIDEO_UPLOAD_PIPELINE={
- "VEM_S3_BUCKET": "vem_test_bucket", "BUCKET": "test_bucket", "ROOT_PATH": "test_root"
-})
-class VideosHandlerTestCase(
- VideoUploadTestBase,
- VideoStudioAccessTestsMixin,
- VideoPipelineStudioAccessTestsMixin,
- VideoUploadPostTestsMixin,
- CourseTestCase
-):
- """Test cases for the main video upload endpoint"""
-
- VIEW_NAME = 'videos_handler'
-
- def test_get_json(self):
- response = self.client.get_json(self.url)
- self.assertEqual(response.status_code, 200) # noqa: PT009
- response_videos = json.loads(response.content.decode('utf-8'))['videos']
- self.assertEqual(len(response_videos), len(self.previous_uploads)) # noqa: PT009
- for i, response_video in enumerate(response_videos):
- # Videos should be returned by creation date descending
- original_video = self.previous_uploads[-(i + 1)]
- print(response_video.keys())
- self.assertEqual( # noqa: PT009
- set(response_video.keys()),
- {
- 'edx_video_id',
- 'client_video_id',
- 'created',
- 'duration',
- 'status',
- 'status_nontranslated',
- 'course_video_image_url',
- 'file_size',
- 'download_link',
- 'transcripts',
- 'transcription_status',
- 'transcript_urls',
- 'error_description',
- }
- )
- dateutil.parser.parse(response_video['created'])
- for field in ['edx_video_id', 'client_video_id', 'duration']:
- self.assertEqual(response_video[field], original_video[field]) # noqa: PT009
- self.assertEqual( # noqa: PT009
- response_video['status'],
- convert_video_status(original_video)
- )
-
- @ddt.data(
- (
- [
- 'edx_video_id', 'client_video_id', 'created', 'duration',
- 'status', 'status_nontranslated', 'course_video_image_url', 'file_size',
- 'download_link', 'transcripts', 'transcription_status', 'transcript_urls',
- 'error_description'
- ],
- [
- {
- 'video_id': 'test1',
- 'language_code': 'en',
- 'file_name': 'edx101.srt',
- 'file_format': 'srt',
- 'provider': 'Cielo24'
- }
- ],
- ['en']
- ),
- (
- [
- 'edx_video_id', 'client_video_id', 'created', 'duration',
- 'status', 'status_nontranslated', 'course_video_image_url', 'file_size',
- 'download_link', 'transcripts', 'transcription_status', 'transcript_urls',
- 'error_description'
- ],
- [
- {
- 'video_id': 'test1',
- 'language_code': 'en',
- 'file_name': 'edx101_en.srt',
- 'file_format': 'srt',
- 'provider': 'Cielo24'
- },
- {
- 'video_id': 'test1',
- 'language_code': 'es',
- 'file_name': 'edx101_es.srt',
- 'file_format': 'srt',
- 'provider': 'Cielo24'
- }
- ],
- ['en', 'es']
- )
- )
- @ddt.unpack
- def test_get_json_transcripts(self, expected_video_keys, uploaded_transcripts, expected_transcripts):
- """
- Test that transcripts are attached based on whether the video transcript feature is enabled.
- """
- for transcript in uploaded_transcripts:
- create_or_update_video_transcript(
- transcript['video_id'],
- transcript['language_code'],
- metadata={
- 'file_name': transcript['file_name'],
- 'file_format': transcript['file_format'],
- 'provider': transcript['provider']
- }
- )
-
- response = self.client.get_json(self.url)
- self.assertEqual(response.status_code, 200) # noqa: PT009
- response_videos = json.loads(response.content.decode('utf-8'))['videos']
- self.assertEqual(len(response_videos), len(self.previous_uploads)) # noqa: PT009
- for response_video in response_videos:
- print(response_video)
-
- self.assertEqual(set(response_video.keys()), set(expected_video_keys)) # noqa: PT009
- if response_video['edx_video_id'] == self.previous_uploads[0]['edx_video_id']:
- self.assertEqual(response_video.get('transcripts', []), expected_transcripts) # noqa: PT009
-
- def test_get_redirects_to_video_uploads_url(self):
- """
- Test that GET requests redirect to the MFE video uploads page.
- """
- from cms.djangoapps.contentstore.utils import get_video_uploads_url
- response = self.client.get(self.url)
- self.assertEqual(response.status_code, 302) # noqa: PT009
- self.assertEqual(response.url, get_video_uploads_url(self.course.id)) # noqa: PT009
-
- @override_settings(AWS_ACCESS_KEY_ID="test_key_id", AWS_SECRET_ACCESS_KEY="test_secret")
- @patch("cms.djangoapps.contentstore.video_storage_handlers.boto3.resource")
- @ddt.data(
- (
- [
- {
- "file_name": "supported-1.mp4",
- "content_type": "video/mp4",
- },
- {
- "file_name": "supported-2.mov",
- "content_type": "video/quicktime",
- },
- ],
- 200
- ),
- (
- [
- {
- "file_name": "unsupported-1.txt",
- "content_type": "text/plain",
- },
- {
- "file_name": "unsupported-2.png",
- "content_type": "image/png",
- },
- ],
- 400
- )
- )
- @ddt.unpack
- def test_video_supported_file_formats(self, files, expected_status, mock_boto3_resource):
- """
- Test that video upload works correctly against supported and unsupported file formats.
- """
- # Setup boto3 mocks
- mock_s3_client, mock_bucket, mock_s3_resource = setup_s3_mocks(mock_boto3_resource)
-
- # Mock generate_presigned_url to return different URLs for each file
- def mock_generate_presigned_url(operation, Params=None, ExpiresIn=None):
- file_name = Params['Metadata']['client_video_id']
- return f'http://example.com/url_{file_name}'
-
- mock_s3_client.generate_presigned_url.side_effect = mock_generate_presigned_url
-
- # Check supported formats
- response = self.client.post(
- self.url,
- json.dumps({"files": files}),
- content_type="application/json"
- )
- self.assertEqual(response.status_code, expected_status) # noqa: PT009
- response = json.loads(response.content.decode('utf-8'))
-
- if expected_status == 200:
- self.assertNotIn('error', response) # noqa: PT009
- else:
- self.assertIn('error', response) # noqa: PT009
- self.assertEqual(response['error'], "Request 'files' entry contain unsupported content_type") # noqa: PT009
-
- @override_settings(AWS_ACCESS_KEY_ID='test_key_id', AWS_SECRET_ACCESS_KEY='test_secret')
- @patch('cms.djangoapps.contentstore.video_storage_handlers.boto3.resource')
- def test_upload_with_non_ascii_charaters(self, mock_boto3_resource):
- """
- Test that video uploads throws error message when file name contains special characters.
- """
- # Setup boto3 mocks
- mock_s3_client, mock_bucket, mock_s3_resource = setup_s3_mocks(mock_boto3_resource)
-
- file_name = 'test\u2019_file.mp4'
- files = [{'file_name': file_name, 'content_type': 'video/mp4'}]
-
- response = self.client.post(
- self.url,
- json.dumps({'files': files}),
- content_type='application/json'
- )
- self.assertEqual(response.status_code, 400) # noqa: PT009
- response = json.loads(response.content.decode('utf-8'))
- self.assertEqual(response['error'], 'The file name for %s must contain only ASCII characters.' % file_name) # noqa: PT009, UP031 # pylint: disable=line-too-long
-
- @override_settings(AWS_ACCESS_KEY_ID='test_key_id', AWS_SECRET_ACCESS_KEY='test_secret', AWS_SECURITY_TOKEN='token')
- @patch('cms.djangoapps.contentstore.video_storage_handlers.boto3.resource')
- @override_waffle_flag(ENABLE_DEVSTACK_VIDEO_UPLOADS, active=True)
- def test_devstack_upload_connection(self, mock_boto3_resource):
- files = [{'file_name': 'first.mp4', 'content_type': 'video/mp4'}]
-
- # Setup boto3 mocks
- mock_s3_client, mock_bucket, mock_s3_resource = setup_s3_mocks(mock_boto3_resource)
-
- # Mock generate_presigned_url to return different URLs for each file
- def mock_generate_presigned_url(operation, Params=None, ExpiresIn=None):
- file_name = Params['Metadata']['client_video_id']
- return f'http://example.com/url_{file_name}'
-
- mock_s3_client.generate_presigned_url.side_effect = mock_generate_presigned_url
-
- response = self.client.post(
- self.url,
- json.dumps({'files': files}),
- content_type='application/json'
- )
-
- self.assertEqual(response.status_code, 200) # noqa: PT009
- mock_boto3_resource.assert_called_once_with(
- "s3",
- aws_access_key_id=settings.AWS_ACCESS_KEY_ID,
- aws_secret_access_key=settings.AWS_SECRET_ACCESS_KEY,
- security_token=settings.AWS_SECURITY_TOKEN
- )
-
- @patch('cms.djangoapps.contentstore.video_storage_handlers.boto3.resource')
- def test_send_course_to_vem_pipeline(self, mock_boto3_resource):
- """
- Test that uploads always go to VEM S3 bucket by default.
- """
- files = [{'file_name': 'first.mp4', 'content_type': 'video/mp4'}]
-
- # Setup boto3 mocks
- mock_s3_client, mock_bucket, mock_s3_resource = setup_s3_mocks(mock_boto3_resource)
-
- # Mock generate_presigned_url to return different URLs for each file
- def mock_generate_presigned_url(operation, Params=None, ExpiresIn=None):
- file_name = Params['Metadata']['client_video_id']
- return f'http://example.com/url_{file_name}'
-
- mock_s3_client.generate_presigned_url.side_effect = mock_generate_presigned_url
-
- response = self.client.post(
- self.url,
- json.dumps({'files': files}),
- content_type='application/json'
- )
-
- self.assertEqual(response.status_code, 200) # noqa: PT009
- mock_s3_resource.Bucket.assert_called_once_with(
- settings.VIDEO_UPLOAD_PIPELINE['VEM_S3_BUCKET'] # pylint: disable=unsubscriptable-object
- )
-
- @override_settings(AWS_ACCESS_KEY_ID='test_key_id', AWS_SECRET_ACCESS_KEY='test_secret')
- @patch('cms.djangoapps.contentstore.video_storage_handlers.boto3.resource')
- @ddt.data(
- {
- 'global_waffle': True,
- 'course_override': WaffleFlagCourseOverrideModel.ALL_CHOICES.off,
- 'expect_token': True
- },
- {
- 'global_waffle': False,
- 'course_override': WaffleFlagCourseOverrideModel.ALL_CHOICES.on,
- 'expect_token': False
- },
- {
- 'global_waffle': False,
- 'course_override': WaffleFlagCourseOverrideModel.ALL_CHOICES.off,
- 'expect_token': True
- }
- )
- def test_video_upload_token_in_meta(self, data, mock_boto3_resource):
- """
- Test video upload token in s3 metadata.
- """
- @contextmanager
- def proxy_manager(manager, ignore_manager):
- """
- This acts as proxy to the original manager in the arguments given
- the original manager is not set to be ignored.
- """
- if ignore_manager:
- yield
- else:
- with manager:
- yield
-
- file_data = {
- 'file_name': 'first.mp4',
- 'content_type': 'video/mp4',
- }
-
- # Setup boto3 mocks
- mock_s3_client, mock_bucket, mock_s3_resource = setup_s3_mocks(mock_boto3_resource)
-
- # Track generate_presigned_url calls to inspect metadata
- presigned_url_calls = []
-
- def mock_generate_presigned_url(operation, Params=None, ExpiresIn=None):
- presigned_url_calls.append((operation, Params, ExpiresIn))
- file_name = Params['Metadata']['client_video_id']
- return f'http://example.com/url_{file_name}'
-
- mock_s3_client.generate_presigned_url.side_effect = mock_generate_presigned_url
-
- with patch.object(WaffleFlagCourseOverrideModel, 'override_value', return_value=data['course_override']):
- with override_waffle_flag(DEPRECATE_YOUTUBE, active=data['global_waffle']):
- response = self.client.post(
- self.url,
- json.dumps({'files': [file_data]}),
- content_type='application/json'
- )
- self.assertEqual(response.status_code, 200) # noqa: PT009
-
- # Check if course_video_upload_token is in metadata based on expectation
- if data['expect_token']:
- # We should find the token in the metadata
- self.assertEqual(len(presigned_url_calls), 1) # noqa: PT009
- metadata = presigned_url_calls[0][1]['Metadata']
- self.assertIn('course_video_upload_token', metadata) # noqa: PT009
- self.assertEqual(metadata['course_video_upload_token'], self.test_token) # noqa: PT009
- else:
- # If we don't expect a token, verify it's not in metadata
- if presigned_url_calls:
- metadata = presigned_url_calls[0][1]['Metadata']
- self.assertNotIn('course_video_upload_token', metadata) # noqa: PT009
-
- def _assert_video_removal(self, url, edx_video_id, deleted_videos):
- """
- Verify that if correct video is removed from a particular course.
-
- Arguments:
- url (str): URL to get uploaded videos
- edx_video_id (str): video id
- deleted_videos (int): how many videos are deleted
- """
- response = self.client.get_json(url)
- self.assertEqual(response.status_code, 200) # noqa: PT009
- response_videos = json.loads(response.content.decode('utf-8'))["videos"]
- self.assertEqual(len(response_videos), len(self.previous_uploads) - deleted_videos) # noqa: PT009
-
- if deleted_videos:
- self.assertNotIn(edx_video_id, [video.get('edx_video_id') for video in response_videos]) # noqa: PT009
- else:
- self.assertIn(edx_video_id, [video.get('edx_video_id') for video in response_videos]) # noqa: PT009
-
- def test_video_removal(self):
- """
- Verifies that video removal is working as expected.
- """
- edx_video_id = 'test1'
- remove_url = self.get_url_for_course_key(self.course.id, {'edx_video_id': edx_video_id})
- response = self.client.delete(remove_url, HTTP_ACCEPT="application/json")
- self.assertEqual(response.status_code, 204) # noqa: PT009
-
- self._assert_video_removal(self.url, edx_video_id, 1)
-
- def test_video_removal_multiple_courses(self):
- """
- Verifies that video removal is working as expected for multiple courses.
-
- If a video is used by multiple courses then removal from one course shouldn't effect the other course.
- """
- # remove video from course1
- edx_video_id = 'test1'
- remove_url = self.get_url_for_course_key(self.course.id, {'edx_video_id': edx_video_id})
- response = self.client.delete(remove_url, HTTP_ACCEPT="application/json")
- self.assertEqual(response.status_code, 204) # noqa: PT009
-
- # verify that video is only deleted from course1 only
- self._assert_video_removal(self.url, edx_video_id, 1)
- self._assert_video_removal(self.get_url_for_course_key(self.course2.id), edx_video_id, 0)
-
- def test_convert_video_status(self):
- """
- Verifies that convert_video_status works as expected.
- """
- video = self.previous_uploads[0]
-
- # video status should be failed if it's in upload state for more than 24 hours
- video['created'] = datetime(2016, 1, 1, 10, 10, 10, 0, pytz.UTC)
- status = convert_video_status(video)
- self.assertEqual(status, StatusDisplayStrings.get('upload_failed')) # noqa: PT009
-
- # `invalid_token` should be converted to `youtube_duplicate`
- video['created'] = datetime.now(pytz.UTC)
- video['status'] = 'invalid_token'
- status = convert_video_status(video)
- self.assertEqual(status, StatusDisplayStrings.get('youtube_duplicate')) # noqa: PT009
-
- # The "encode status" should be converted to `file_complete` if video encodes are complete
- video['status'] = 'transcription_in_progress'
- status = convert_video_status(video, is_video_encodes_ready=True)
- self.assertEqual(status, StatusDisplayStrings.get('file_complete')) # noqa: PT009
-
- # If encoding is not complete return the status as it is
- video['status'] = 's3_upload_failed'
- status = convert_video_status(video)
- self.assertEqual(status, StatusDisplayStrings.get('s3_upload_failed')) # noqa: PT009
-
- # for all other status, there should not be any conversion
- statuses = list(StatusDisplayStrings._STATUS_MAP.keys()) # pylint: disable=protected-access
- statuses.remove('invalid_token')
- for status in statuses:
- video['status'] = status
- new_status = convert_video_status(video)
- self.assertEqual(new_status, StatusDisplayStrings.get(status)) # noqa: PT009
-
- def assert_video_status(self, url, edx_video_id, status):
- """
- Verifies that video with `edx_video_id` has `status`
- """
- response = self.client.get_json(url)
- self.assertEqual(response.status_code, 200) # noqa: PT009
- videos = json.loads(response.content.decode('utf-8'))["videos"]
- for video in videos:
- if video['edx_video_id'] == edx_video_id:
- return self.assertEqual(video['status'], status) # noqa: PT009
-
- # Test should fail if video not found
- self.assertEqual(True, False, 'Invalid edx_video_id') # noqa: PT009
-
- @patch('cms.djangoapps.contentstore.video_storage_handlers.LOGGER')
- def test_video_status_update_request(self, mock_logger):
- """
- Verifies that video status update request works as expected.
- """
- url = self.get_url_for_course_key(self.course.id)
- edx_video_id = 'test1'
- self.assert_video_status(url, edx_video_id, 'Uploading')
-
- response = self.client.post(
- url,
- json.dumps([{
- 'edxVideoId': edx_video_id,
- 'status': 'upload_failed',
- 'message': 'server down'
- }]),
- content_type="application/json"
- )
-
- mock_logger.info.assert_called_with(
- 'VIDEOS: Video status update with id [%s], status [%s] and message [%s]',
- edx_video_id,
- 'upload_failed',
- 'server down'
- )
-
- self.assertEqual(response.status_code, 204) # noqa: PT009
-
- self.assert_video_status(url, edx_video_id, 'Failed')
-
- @ddt.data(
- ('test_video_token', "Transcription in Progress"),
- ('', "Ready"),
- )
- @ddt.unpack
- def test_video_transcript_status_conversion(self, course_video_upload_token, expected_video_status_text):
- """
- Verifies that video status `transcription_in_progress` gets converted
- correctly into the `file_complete` for the new video workflow and
- stays as it is, for the old video workflow.
- """
- self.course.video_upload_pipeline = {
- 'course_video_upload_token': course_video_upload_token
- }
- self.save_course()
-
- url = self.get_url_for_course_key(self.course.id)
- edx_video_id = 'test1'
- self.assert_video_status(url, edx_video_id, 'Uploading')
-
- response = self.client.post(
- url,
- json.dumps([{
- 'edxVideoId': edx_video_id,
- 'status': 'transcription_in_progress',
- 'message': 'Transcription is in progress'
- }]),
- content_type="application/json"
- )
- self.assertEqual(response.status_code, 204) # noqa: PT009
-
- self.assert_video_status(url, edx_video_id, expected_video_status_text)
-
-
-@ddt.ddt
-@patch.dict("django.conf.settings.FEATURES", {"ENABLE_VIDEO_UPLOAD_PIPELINE": True})
-@override_settings(VIDEO_UPLOAD_PIPELINE={
- "VEM_S3_BUCKET": "vem_test_bucket", "BUCKET": "test_bucket", "ROOT_PATH": "test_root"
-})
-class GenerateVideoUploadLinkTestCase(
- VideoUploadTestBase,
- VideoUploadPostTestsMixin,
- CourseTestCase
-):
- """
- Test cases for the main video upload endpoint
- """
-
- VIEW_NAME = 'generate_video_upload_link'
-
- def test_unsupported_requests_fail(self):
- """
- The API only supports post, make sure other requests fail
- """
- response = self.client.get(self.url)
- self.assertEqual(response.status_code, 405) # noqa: PT009
-
- response = self.client.put(self.url)
- self.assertEqual(response.status_code, 405) # noqa: PT009
-
- response = self.client.patch(self.url)
- self.assertEqual(response.status_code, 405) # noqa: PT009
-
-
-@ddt.ddt
-@patch.dict('django.conf.settings.FEATURES', {'ENABLE_VIDEO_UPLOAD_PIPELINE': True})
-@override_settings(VIDEO_UPLOAD_PIPELINE={'BUCKET': 'test_bucket', 'ROOT_PATH': 'test_root'})
-class VideoImageTestCase(VideoUploadTestBase, CourseTestCase):
- """
- Tests for video image.
- """
-
- VIEW_NAME = "video_images_handler"
-
- def verify_image_upload_reponse(self, course_id, edx_video_id, upload_response):
- """
- Verify that image is uploaded successfully.
-
- Arguments:
- course_id: ID of course
- edx_video_id: ID of video
- upload_response: Upload response object
-
- Returns:
- uploaded image url
- """
- self.assertEqual(upload_response.status_code, 200) # noqa: PT009
- response = json.loads(upload_response.content.decode('utf-8'))
- val_image_url = get_course_video_image_url(course_id=course_id, edx_video_id=edx_video_id)
- self.assertEqual(response['image_url'], val_image_url) # noqa: PT009
-
- return val_image_url
-
- def verify_error_message(self, response, error_message):
- """
- Verify that image upload failure gets proper error message.
-
- Arguments:
- response: Response object.
- error_message: Expected error message.
- """
- self.assertEqual(response.status_code, 400) # noqa: PT009
- response = json.loads(response.content.decode('utf-8'))
- self.assertIn('error', response) # noqa: PT009
- self.assertEqual(response['error'], error_message) # noqa: PT009
-
- @override_waffle_switch(VIDEO_IMAGE_UPLOAD_ENABLED, False)
- def test_video_image_upload_disabled(self):
- """
- Tests the video image upload when the feature is disabled.
- """
- video_image_upload_url = self.get_url_for_course_key(self.course.id, {'edx_video_id': 'test_vid_id'})
- response = self.client.post(video_image_upload_url, {'file': 'dummy_file'}, format='multipart')
- self.assertEqual(response.status_code, 404) # noqa: PT009
-
- @override_waffle_switch(VIDEO_IMAGE_UPLOAD_ENABLED, True)
- def test_video_image(self):
- """
- Test video image is saved.
- """
- edx_video_id = 'test1'
- video_image_upload_url = self.get_url_for_course_key(self.course.id, {'edx_video_id': edx_video_id})
- with make_image_file(
- dimensions=(settings.VIDEO_IMAGE_MIN_WIDTH, settings.VIDEO_IMAGE_MIN_HEIGHT),
- ) as image_file:
- response = self.client.post(video_image_upload_url, {'file': image_file}, format='multipart')
- image_url1 = self.verify_image_upload_reponse(self.course.id, edx_video_id, response)
-
- # upload again to verify that new image is uploaded successfully
- with make_image_file(
- dimensions=(settings.VIDEO_IMAGE_MIN_WIDTH, settings.VIDEO_IMAGE_MIN_HEIGHT),
- ) as image_file:
- response = self.client.post(video_image_upload_url, {'file': image_file}, format='multipart')
- image_url2 = self.verify_image_upload_reponse(self.course.id, edx_video_id, response)
-
- self.assertNotEqual(image_url1, image_url2) # noqa: PT009
-
- @override_waffle_switch(VIDEO_IMAGE_UPLOAD_ENABLED, True)
- def test_video_image_no_file(self):
- """
- Test that an error error message is returned if upload request is incorrect.
- """
- video_image_upload_url = self.get_url_for_course_key(self.course.id, {'edx_video_id': 'test1'})
- response = self.client.post(video_image_upload_url, {})
- self.verify_error_message(response, 'An image file is required.')
-
- @override_waffle_switch(VIDEO_IMAGE_UPLOAD_ENABLED, True)
- def test_no_video_image(self):
- """
- Test image url is set to None if no video image.
- """
- edx_video_id = 'test1'
- get_videos_url = reverse_course_url('videos_handler', self.course.id)
- video_image_upload_url = self.get_url_for_course_key(self.course.id, {'edx_video_id': edx_video_id})
- with make_image_file(
- dimensions=(settings.VIDEO_IMAGE_MIN_WIDTH, settings.VIDEO_IMAGE_MIN_HEIGHT),
- ) as image_file:
- self.client.post(video_image_upload_url, {'file': image_file}, format='multipart')
-
- val_image_url = get_course_video_image_url(course_id=self.course.id, edx_video_id=edx_video_id)
-
- response = self.client.get_json(get_videos_url)
- self.assertEqual(response.status_code, 200) # noqa: PT009
- response_videos = json.loads(response.content.decode('utf-8'))["videos"]
- for response_video in response_videos:
- if response_video['edx_video_id'] == edx_video_id:
- self.assertEqual(response_video['course_video_image_url'], val_image_url) # noqa: PT009
- else:
- self.assertEqual(response_video['course_video_image_url'], None) # noqa: PT009
-
- @ddt.data(
- # Image file type validation
- (
- {
- 'extension': '.png'
- },
- None
- ),
- (
- {
- 'extension': '.gif'
- },
- None
- ),
- (
- {
- 'extension': '.bmp'
- },
- None
- ),
- (
- {
- 'extension': '.jpg'
- },
- None
- ),
- (
- {
- 'extension': '.jpeg'
- },
- None
- ),
- (
- {
- 'extension': '.PNG'
- },
- None
- ),
- (
- {
- 'extension': '.tiff'
- },
- 'This image file type is not supported. Supported file types are {supported_file_formats}.'.format( # noqa: UP032 # pylint: disable=line-too-long
- supported_file_formats=list(settings.VIDEO_IMAGE_SUPPORTED_FILE_FORMATS.keys())
- )
- ),
- # Image file size validation
- (
- {
- 'size': settings.VIDEO_IMAGE_SETTINGS['VIDEO_IMAGE_MAX_BYTES'] + 10
- },
- 'This image file must be smaller than {image_max_size}.'.format( # noqa: UP032
- image_max_size=settings.VIDEO_IMAGE_MAX_FILE_SIZE_MB
- )
- ),
- (
- {
- 'size': settings.VIDEO_IMAGE_SETTINGS['VIDEO_IMAGE_MIN_BYTES'] - 10
- },
- 'This image file must be larger than {image_min_size}.'.format( # noqa: UP032
- image_min_size=settings.VIDEO_IMAGE_MIN_FILE_SIZE_KB
- )
- ),
- # Image file minimum width / height
- (
- {
- 'width': 16, # 16x9
- 'height': 9
- },
- 'Recommended image resolution is {image_file_max_width}x{image_file_max_height}. The minimum resolution is {image_file_min_width}x{image_file_min_height}.'.format( # lint-amnesty, pylint: disable=line-too-long # noqa: UP032
- image_file_max_width=settings.VIDEO_IMAGE_MAX_WIDTH,
- image_file_max_height=settings.VIDEO_IMAGE_MAX_HEIGHT,
- image_file_min_width=settings.VIDEO_IMAGE_MIN_WIDTH,
- image_file_min_height=settings.VIDEO_IMAGE_MIN_HEIGHT
- )
- ),
- (
- {
- 'width': settings.VIDEO_IMAGE_MIN_WIDTH - 10,
- 'height': settings.VIDEO_IMAGE_MIN_HEIGHT
- },
- 'Recommended image resolution is {image_file_max_width}x{image_file_max_height}. The minimum resolution is {image_file_min_width}x{image_file_min_height}.'.format( # lint-amnesty, pylint: disable=line-too-long # noqa: UP032
- image_file_max_width=settings.VIDEO_IMAGE_MAX_WIDTH,
- image_file_max_height=settings.VIDEO_IMAGE_MAX_HEIGHT,
- image_file_min_width=settings.VIDEO_IMAGE_MIN_WIDTH,
- image_file_min_height=settings.VIDEO_IMAGE_MIN_HEIGHT
- )
- ),
- (
- {
- 'width': settings.VIDEO_IMAGE_MIN_WIDTH,
- 'height': settings.VIDEO_IMAGE_MIN_HEIGHT - 10
- },
- ( # noqa: UP032
- 'Recommended image resolution is {image_file_max_width}x{image_file_max_height}. '
- 'The minimum resolution is {image_file_min_width}x{image_file_min_height}.'
- ).format(
- image_file_max_width=settings.VIDEO_IMAGE_MAX_WIDTH,
- image_file_max_height=settings.VIDEO_IMAGE_MAX_HEIGHT,
- image_file_min_width=settings.VIDEO_IMAGE_MIN_WIDTH,
- image_file_min_height=settings.VIDEO_IMAGE_MIN_HEIGHT
- )
- ),
- (
- {
- 'width': 1200, # not 16:9, but width/height check first.
- 'height': 100
- },
- ( # noqa: UP032
- 'Recommended image resolution is {image_file_max_width}x{image_file_max_height}. '
- 'The minimum resolution is {image_file_min_width}x{image_file_min_height}.'
- ).format(
- image_file_max_width=settings.VIDEO_IMAGE_MAX_WIDTH,
- image_file_max_height=settings.VIDEO_IMAGE_MAX_HEIGHT,
- image_file_min_width=settings.VIDEO_IMAGE_MIN_WIDTH,
- image_file_min_height=settings.VIDEO_IMAGE_MIN_HEIGHT
- )
- ),
- # Image file aspect ratio validation
- (
- {
- 'width': settings.VIDEO_IMAGE_MAX_WIDTH, # 1280x720
- 'height': settings.VIDEO_IMAGE_MAX_HEIGHT
- },
- None
- ),
- (
- {
- 'width': 850, # 16:9
- 'height': 478
- },
- None
- ),
- (
- {
- 'width': 940, # 1.67 ratio, applicable aspect ratio margin of .01
- 'height': 560
- },
- None
- ),
- (
- {
- 'width': settings.VIDEO_IMAGE_MIN_WIDTH + 100,
- 'height': settings.VIDEO_IMAGE_MIN_HEIGHT + 200
- },
- 'This image file must have an aspect ratio of {video_image_aspect_ratio_text}.'.format( # noqa: UP032
- video_image_aspect_ratio_text=settings.VIDEO_IMAGE_ASPECT_RATIO_TEXT
- )
- ),
- # Image file name validation
- (
- {
- 'prefix': 'nøn-åßç¡¡'
- },
- 'The image file name can only contain letters, numbers, hyphens (-), and underscores (_).'
- )
- )
- @ddt.unpack
- @override_waffle_switch(VIDEO_IMAGE_UPLOAD_ENABLED, True)
- def test_video_image_validation_message(self, image_data, error_message):
- """
- Test video image validation gives proper error message.
-
- Arguments:
- image_data (Dict): Specific data to create image file.
- error_message (String): Error message
- """
- edx_video_id = 'test1'
- video_image_upload_url = self.get_url_for_course_key(self.course.id, {'edx_video_id': edx_video_id})
- with make_image_file(
- dimensions=(
- image_data.get('width', settings.VIDEO_IMAGE_MIN_WIDTH),
- image_data.get('height', settings.VIDEO_IMAGE_MIN_HEIGHT)
- ),
- prefix=image_data.get('prefix', 'videoimage'),
- extension=image_data.get('extension', '.png'),
- force_size=image_data.get('size', settings.VIDEO_IMAGE_SETTINGS['VIDEO_IMAGE_MIN_BYTES'])
- ) as image_file:
- response = self.client.post(video_image_upload_url, {'file': image_file}, format='multipart')
- if error_message:
- self.verify_error_message(response, error_message)
- else:
- self.verify_image_upload_reponse(self.course.id, edx_video_id, response)
-
-
-@ddt.ddt
-@patch(
- 'openedx.core.djangoapps.video_config.models.VideoTranscriptEnabledFlag.feature_enabled',
- Mock(return_value=True)
-)
-@patch.dict('django.conf.settings.FEATURES', {'ENABLE_VIDEO_UPLOAD_PIPELINE': True})
-class TranscriptPreferencesTestCase(VideoUploadTestBase, CourseTestCase):
- """
- Tests for video transcripts preferences.
- """
-
- VIEW_NAME = 'transcript_preferences_handler'
-
- def test_405_with_not_allowed_request_method(self):
- """
- Verify that 405 is returned in case of not-allowed request methods.
- Allowed request methods are POST and DELETE.
- """
- video_transcript_url = self.get_url_for_course_key(self.course.id)
- response = self.client.get(
- video_transcript_url,
- content_type='application/json'
- )
- self.assertEqual(response.status_code, 405) # noqa: PT009
-
- @ddt.data(
- # Video transcript feature disabled
- (
- {},
- False,
- '',
- 404,
- ),
- # Error cases
- (
- {},
- True,
- "Invalid provider None.",
- 400
- ),
- (
- {
- 'provider': ''
- },
- True,
- "Invalid provider .",
- 400
- ),
- (
- {
- 'provider': 'dummy-provider'
- },
- True,
- "Invalid provider dummy-provider.",
- 400
- ),
- (
- {
- 'provider': TranscriptProvider.CIELO24
- },
- True,
- "Invalid cielo24 fidelity None.",
- 400
- ),
- (
- {
- 'provider': TranscriptProvider.CIELO24,
- 'cielo24_fidelity': 'PROFESSIONAL',
- },
- True,
- "Invalid cielo24 turnaround None.",
- 400
- ),
- (
- {
- 'provider': TranscriptProvider.CIELO24,
- 'cielo24_fidelity': 'PROFESSIONAL',
- 'cielo24_turnaround': 'STANDARD',
- 'video_source_language': 'en'
- },
- True,
- "Invalid languages [].",
- 400
- ),
- (
- {
- 'provider': TranscriptProvider.CIELO24,
- 'cielo24_fidelity': 'PREMIUM',
- 'cielo24_turnaround': 'STANDARD',
- 'video_source_language': 'es'
- },
- True,
- "Unsupported source language es.",
- 400
- ),
- (
- {
- 'provider': TranscriptProvider.CIELO24,
- 'cielo24_fidelity': 'PROFESSIONAL',
- 'cielo24_turnaround': 'STANDARD',
- 'video_source_language': 'en',
- 'preferred_languages': ['es', 'ur']
- },
- True,
- "Invalid languages ['es', 'ur'].",
- 400
- ),
- (
- {
- 'provider': TranscriptProvider.THREE_PLAY_MEDIA
- },
- True,
- "Invalid 3play turnaround None.",
- 400
- ),
- (
- {
- 'provider': TranscriptProvider.THREE_PLAY_MEDIA,
- 'three_play_turnaround': 'standard',
- 'video_source_language': 'zh',
- },
- True,
- "Unsupported source language zh.",
- 400
- ),
- (
- {
- 'provider': TranscriptProvider.THREE_PLAY_MEDIA,
- 'three_play_turnaround': 'standard',
- 'video_source_language': 'es',
- 'preferred_languages': ['es', 'ur']
- },
- True,
- "Invalid languages ['es', 'ur'].",
- 400
- ),
- (
- {
- 'provider': TranscriptProvider.THREE_PLAY_MEDIA,
- 'three_play_turnaround': 'standard',
- 'video_source_language': 'en',
- 'preferred_languages': ['es', 'ur']
- },
- True,
- "Invalid languages ['es', 'ur'].",
- 400
- ),
- # Success
- (
- {
- 'provider': TranscriptProvider.CIELO24,
- 'cielo24_fidelity': 'PROFESSIONAL',
- 'cielo24_turnaround': 'STANDARD',
- 'video_source_language': 'es',
- 'preferred_languages': ['en']
- },
- True,
- '',
- 200
- ),
- (
- {
- 'provider': TranscriptProvider.THREE_PLAY_MEDIA,
- 'three_play_turnaround': 'standard',
- 'preferred_languages': ['en'],
- 'video_source_language': 'en',
- },
- True,
- '',
- 200
- )
- )
- @ddt.unpack
- def test_video_transcript(self, preferences, is_video_transcript_enabled, error_message, expected_status_code):
- """
- Tests that transcript handler works correctly.
- """
- video_transcript_url = self.get_url_for_course_key(self.course.id)
- preferences_data = {
- 'provider': preferences.get('provider'),
- 'cielo24_fidelity': preferences.get('cielo24_fidelity'),
- 'cielo24_turnaround': preferences.get('cielo24_turnaround'),
- 'three_play_turnaround': preferences.get('three_play_turnaround'),
- 'preferred_languages': preferences.get('preferred_languages', []),
- 'video_source_language': preferences.get('video_source_language'),
- }
-
- with patch(
- 'openedx.core.djangoapps.video_config.models.VideoTranscriptEnabledFlag.feature_enabled'
- ) as video_transcript_feature:
- video_transcript_feature.return_value = is_video_transcript_enabled
- response = self.client.post(
- video_transcript_url,
- json.dumps(preferences_data),
- content_type='application/json'
- )
- status_code = response.status_code
- response = json.loads(response.content.decode('utf-8')) if is_video_transcript_enabled else response
-
- self.assertEqual(status_code, expected_status_code) # noqa: PT009
- self.assertEqual(response.get('error', ''), error_message) # noqa: PT009
-
- # Remove modified and course_id fields from the response so as to check the expected transcript preferences.
- response.get('transcript_preferences', {}).pop('modified', None)
- response.get('transcript_preferences', {}).pop('course_id', None)
- expected_preferences = preferences_data if is_video_transcript_enabled and not error_message else {}
- self.assertDictEqual(response.get('transcript_preferences', {}), expected_preferences) # noqa: PT009
-
- def test_remove_transcript_preferences(self):
- """
- Test that transcript handler removes transcript preferences correctly.
- """
- # First add course wide transcript preferences.
- preferences = create_or_update_transcript_preferences(str(self.course.id))
-
- # Verify transcript preferences exist
- self.assertIsNotNone(preferences) # noqa: PT009
-
- response = self.client.delete(
- self.get_url_for_course_key(self.course.id),
- content_type='application/json'
- )
-
- self.assertEqual(response.status_code, 204) # noqa: PT009
-
- # Verify transcript preferences no loger exist
- preferences = get_transcript_preferences(str(self.course.id))
- self.assertIsNone(preferences) # noqa: PT009
-
- def test_remove_transcript_preferences_not_found(self):
- """
- Test that transcript handler works correctly even when no preferences are found.
- """
- course_id = 'course-v1:dummy+course+id'
- # Verify transcript preferences do not exist
- preferences = get_transcript_preferences(course_id)
- self.assertIsNone(preferences) # noqa: PT009
-
- response = self.client.delete(
- self.get_url_for_course_key(course_id),
- content_type='application/json'
- )
- self.assertEqual(response.status_code, 204) # noqa: PT009
-
- # Verify transcript preferences do not exist
- preferences = get_transcript_preferences(course_id)
- self.assertIsNone(preferences) # noqa: PT009
-
- @ddt.data(
- (
- None,
- False
- ),
- (
- {
- 'provider': TranscriptProvider.CIELO24,
- 'cielo24_fidelity': 'PROFESSIONAL',
- 'cielo24_turnaround': 'STANDARD',
- 'preferred_languages': ['en']
- },
- False
- ),
- (
- {
- 'provider': TranscriptProvider.CIELO24,
- 'cielo24_fidelity': 'PROFESSIONAL',
- 'cielo24_turnaround': 'STANDARD',
- 'preferred_languages': ['en']
- },
- True
- )
- )
- @ddt.unpack
- @override_settings(AWS_ACCESS_KEY_ID='test_key_id', AWS_SECRET_ACCESS_KEY='test_secret')
- @patch('cms.djangoapps.contentstore.video_storage_handlers.get_transcript_preferences')
- @patch('cms.djangoapps.contentstore.video_storage_handlers.boto3.resource')
- def test_transcript_preferences_metadata(self, transcript_preferences, is_video_transcript_enabled,
- mock_boto3_resource, mock_transcript_preferences):
- """
- Tests that transcript preference metadata is only set if it is video transcript feature is enabled and
- transcript preferences are already stored in the system.
- """
- file_name = 'test-video.mp4'
- request_data = {'files': [{'file_name': file_name, 'content_type': 'video/mp4'}]}
-
- mock_transcript_preferences.return_value = transcript_preferences
-
- # Setup boto3 mocks
- mock_s3_client, mock_bucket, mock_s3_resource = setup_s3_mocks(mock_boto3_resource)
-
- # Track generate_presigned_url calls to inspect metadata
- presigned_url_calls = []
-
- def mock_generate_presigned_url(operation, Params=None, ExpiresIn=None):
- presigned_url_calls.append((operation, Params, ExpiresIn))
- file_name = Params['Metadata']['client_video_id']
- return f'http://example.com/url_{file_name}'
-
- mock_s3_client.generate_presigned_url.side_effect = mock_generate_presigned_url
-
- videos_handler_url = reverse_course_url('videos_handler', self.course.id)
- with patch(
- 'openedx.core.djangoapps.video_config.models.VideoTranscriptEnabledFlag.feature_enabled'
- ) as video_transcript_feature:
- video_transcript_feature.return_value = is_video_transcript_enabled
- response = self.client.post(videos_handler_url, json.dumps(request_data), content_type='application/json')
-
- self.assertEqual(response.status_code, 200) # noqa: PT009
-
- # Ensure `transcript_preferences` was set up in metadata correctly if sent through request.
- if is_video_transcript_enabled and transcript_preferences:
- self.assertEqual(len(presigned_url_calls), 1) # noqa: PT009
- metadata = presigned_url_calls[0][1]['Metadata']
- self.assertIn('transcript_preferences', metadata) # noqa: PT009
- self.assertEqual(metadata['transcript_preferences'], json.dumps(transcript_preferences)) # noqa: PT009
- else:
- # If conditions aren't met, verify transcript_preferences is not in metadata
- if presigned_url_calls:
- metadata = presigned_url_calls[0][1]['Metadata']
- self.assertNotIn('transcript_preferences', metadata) # noqa: PT009
-
-
-@patch.dict("django.conf.settings.FEATURES", {"ENABLE_VIDEO_UPLOAD_PIPELINE": True})
-@override_settings(VIDEO_UPLOAD_PIPELINE={"BUCKET": "test_bucket", "ROOT_PATH": "test_root"})
-class VideoUrlsCsvTestCase(
- VideoUploadTestBase,
- VideoStudioAccessTestsMixin,
- VideoPipelineStudioAccessTestsMixin,
- CourseTestCase
-):
- """Test cases for the CSV download endpoint for video uploads"""
-
- VIEW_NAME = "video_encodings_download"
-
- def setUp(self):
- super().setUp()
- VideoUploadConfig(profile_whitelist="profile1").save()
-
- def _check_csv_response(self, expected_profiles):
- """
- Check that the response is a valid CSV response containing rows
- corresponding to previous_uploads and including the expected profiles.
- """
- response = self.client.get(self.url)
- self.assertEqual(response.status_code, 200) # noqa: PT009
- self.assertEqual( # noqa: PT009
- response["Content-Disposition"],
- f"attachment; filename=\"{self.course.id.course}_video_urls.csv\""
- )
- response_content = b"".join(response.streaming_content)
- response_reader = StringIO(response_content.decode())
- reader = csv.DictReader(response_reader, dialect=csv.excel)
- self.assertEqual( # noqa: PT009
- reader.fieldnames,
- (
- ["Name", "Duration", "Date Added", "Video ID", "Status"] +
- [f"{profile} URL" for profile in expected_profiles]
- )
- )
- rows = list(reader)
- self.assertEqual(len(rows), len(self.previous_uploads)) # noqa: PT009
- for i, row in enumerate(rows):
- response_video = dict(row.items())
- # Videos should be returned by creation date descending
- original_video = self.previous_uploads[-(i + 1)]
- client_video_id = original_video["client_video_id"]
- self.assertEqual(response_video["Name"], client_video_id) # noqa: PT009
- self.assertEqual(response_video["Duration"], str(original_video["duration"])) # noqa: PT009
- dateutil.parser.parse(response_video["Date Added"])
- self.assertEqual(response_video["Video ID"], original_video["edx_video_id"]) # noqa: PT009
- self.assertEqual(response_video["Status"], convert_video_status(original_video)) # noqa: PT009
- for profile in expected_profiles:
- response_profile_url = response_video[f"{profile} URL"]
- original_encoded_for_profile = next(
- (
- original_encoded
- for original_encoded in original_video["encoded_videos"]
- if original_encoded["profile"] == profile
- ),
- None
- )
- if original_encoded_for_profile:
- original_encoded_for_profile_url = original_encoded_for_profile["url"]
- self.assertEqual(response_profile_url, original_encoded_for_profile_url) # noqa: PT009
- else:
- self.assertEqual(response_profile_url, "") # noqa: PT009
-
- def test_basic(self):
- self._check_csv_response(["profile1"])
-
- def test_profile_whitelist(self):
- VideoUploadConfig(profile_whitelist="profile1,profile2").save()
- self._check_csv_response(["profile1", "profile2"])
-
- def test_non_ascii_course(self):
- course = CourseFactory.create(
- number="nón-äscii",
- video_upload_pipeline={
- "course_video_upload_token": self.test_token,
- }
- )
- response = self.client.get(self.get_url_for_course_key(course.id))
- self.assertEqual(response.status_code, 200) # noqa: PT009
- self.assertEqual( # noqa: PT009
- response["Content-Disposition"],
- "attachment; filename*=utf-8''n%C3%B3n-%C3%A4scii_video_urls.csv"
- )
-
-
-@ddt.ddt
-class GetVideoFeaturesTestCase(
- CourseTestCase
-):
- """Test cases for the get_video_features endpoint """
- def setUp(self):
- super().setUp()
- self.url = self.get_url_for_course_key()
-
- def get_url_for_course_key(self):
- """ Helper to generate a url for a course key """
- return reverse("video_features")
-
- def test_basic(self):
- """ Test for expected return keys """
- response = self.client.get(self.get_url_for_course_key())
- self.assertEqual(response.status_code, 200) # noqa: PT009
- self.assertEqual( # noqa: PT009
- set(response.json().keys()),
- {
- 'videoSharingEnabled',
- 'allowThumbnailUpload',
- }
- )
-
- @ddt.data(True, False)
- def test_video_share_enabled(self, is_enabled):
- """ Test the public video share flag """
- self._test_video_feature(
- PUBLIC_VIDEO_SHARE,
- 'videoSharingEnabled',
- override_waffle_flag,
- is_enabled,
- )
-
- @ddt.data(True, False)
- def test_video_image_upload_enabled(self, is_enabled):
- """ Test the video image upload switch """
- self._test_video_feature(
- VIDEO_IMAGE_UPLOAD_ENABLED,
- 'allowThumbnailUpload',
- override_waffle_switch,
- is_enabled,
- )
-
- def _test_video_feature(self, flag, key, override_fn, is_enabled):
- """ Test that setting a waffle flag or switch on or off will cause the expected result """
- with override_fn(flag, is_enabled):
- response = self.client.get(self.get_url_for_course_key())
-
- self.assertEqual(response.status_code, 200) # noqa: PT009
- self.assertEqual(response.json()[key], is_enabled) # noqa: PT009
-
-
-class GetStorageBucketTestCase(TestCase):
- """ This test just check that connection works and returns the bucket.
- It does not involve any mocking and triggers errors if has any import issue.
- """
- @override_settings(AWS_ACCESS_KEY_ID='test_key_id', AWS_SECRET_ACCESS_KEY='test_secret')
- @override_settings(VIDEO_UPLOAD_PIPELINE={
- "VEM_S3_BUCKET": "vem_test_bucket", "BUCKET": "test_bucket", "ROOT_PATH": "test_root"
- })
- @patch('cms.djangoapps.contentstore.video_storage_handlers.boto3.resource')
- def test_storage_bucket(self, mock_boto3_resource):
- """ Test that storage service functions work correctly with boto3."""
- # Setup boto3 mocks
- mock_s3_client, mock_bucket, mock_s3_resource = setup_s3_mocks(mock_boto3_resource, 'vem_test_bucket')
-
- # Test storage_service_bucket function
- bucket = storage_service_bucket()
- self.assertEqual(bucket.name, 'vem_test_bucket') # noqa: PT009
- mock_s3_resource.Bucket.assert_called_once_with('vem_test_bucket')
-
- # Test storage_service_key function
- edx_video_id = 'dummy_video'
- key_name = storage_service_key(bucket, file_name=edx_video_id)
- expected_key = 'test_root/dummy_video'
- self.assertEqual(key_name, expected_key) # noqa: PT009
-
- # Test that we can generate presigned URL using the bucket's client
- mock_s3_client.generate_presigned_url.return_value = (
- 'https://vem_test_bucket.s3.amazonaws.com:443/test_root/dummy_video?signature=test'
- )
- upload_url = mock_s3_client.generate_presigned_url(
- 'put_object',
- Params={
- 'Bucket': bucket.name,
- 'Key': key_name,
- 'ContentType': 'video/mp4'
- },
- ExpiresIn=KEY_EXPIRATION_IN_SECONDS
- )
-
- self.assertIn("vem_test_bucket.s3.amazonaws.com", upload_url) # noqa: PT009
- self.assertIn("test_root/dummy_video", upload_url) # noqa: PT009
-
-
-class CourseYoutubeEdxVideoIds(ModuleStoreTestCase):
- """
- This test checks youtube videos in a course
- """
- VIEW_NAME = 'youtube_edx_video_ids'
-
- def setUp(self):
- super().setUp()
- self.course = CourseFactory.create()
- self.course_with_no_youtube_videos = CourseFactory.create()
- self.store = modulestore()
- self.user = UserFactory()
- self.client.login(username=self.user.username, password='Password1234')
-
- def get_url_for_course_key(self, course_key, kwargs=None):
- """Return video handler URL for the given course"""
- return reverse_course_url(self.VIEW_NAME, course_key, kwargs) # lint-amnesty, pylint: disable=no-member
-
- def test_course_with_youtube_videos(self):
- course_key = self.course.id
-
- with self.store.bulk_operations(course_key):
- chapter_loc = self.store.create_child(
- self.user.id, self.course.location, 'chapter', 'test_chapter'
- ).location
- seq_loc = self.store.create_child(
- self.user.id, chapter_loc, 'sequential', 'test_seq'
- ).location
- vert_loc = self.store.create_child(self.user.id, seq_loc, 'vertical', 'test_vert').location
- self.store.create_child(
- self.user.id,
- vert_loc,
- 'problem',
- 'test_problem',
- fields={"data": "Test "}
- )
- self.store.create_child(
- self.user.id, vert_loc, 'video', fields={
- "youtube_is_available": False,
- "name": "sample_video",
- "edx_video_id": "youtube_193_84709099",
- }
- )
-
- response = self.client.get(self.get_url_for_course_key(course_key))
- self.assertEqual(response.status_code, 200) # noqa: PT009
-
- edx_video_ids = json.loads(response.content.decode('utf-8'))['edx_video_ids']
- self.assertEqual(len(edx_video_ids), 1) # noqa: PT009
-
- def test_course_with_no_youtube_videos(self):
- course_key = self.course_with_no_youtube_videos.id
-
- with self.store.bulk_operations(course_key):
- chapter_loc = self.store.create_child(
- self.user.id, self.course_with_no_youtube_videos.location, 'chapter', 'test_chapter'
- ).location
- seq_loc = self.store.create_child(
- self.user.id, chapter_loc, 'sequential', 'test_seq'
- ).location
- vert_loc = self.store.create_child(self.user.id, seq_loc, 'vertical', 'test_vert').location
- self.store.create_child(
- self.user.id, vert_loc, 'problem', 'test_problem', fields={"data": "Test "}
- )
- self.store.create_child(
- self.user.id, vert_loc, 'video', fields={
- "youtube_id_1_0": None,
- "name": "sample_video",
- "edx_video_id": "no_youtube_193_84709099",
- }
- )
-
- response = self.client.get(self.get_url_for_course_key(course_key))
-
- edx_video_ids = json.loads(response.content.decode('utf-8'))['edx_video_ids']
- self.assertEqual(response.status_code, 200) # noqa: PT009
- self.assertEqual(len(edx_video_ids), 0) # noqa: PT009
+"""
+Unit tests for video-related REST APIs.
+"""
+
+
+import csv
+import json
+import re
+from contextlib import contextmanager
+from datetime import datetime
+from io import StringIO
+from unittest.mock import Mock, patch
+
+import dateutil.parser
+import ddt
+import pytz
+from django.conf import settings
+from django.test import TestCase
+from django.test.utils import override_settings
+from django.urls import reverse
+from edx_toggles.toggles.testutils import override_waffle_flag, override_waffle_switch
+from edxval.api import (
+ create_or_update_transcript_preferences,
+ create_or_update_video_transcript,
+ create_profile,
+ create_video,
+ get_course_video_image_url,
+ get_transcript_preferences,
+ get_video_info,
+)
+
+from cms.djangoapps.contentstore.models import VideoUploadConfig
+from cms.djangoapps.contentstore.tests.utils import CourseTestCase
+from cms.djangoapps.contentstore.utils import reverse_course_url
+from cms.djangoapps.contentstore.video_storage_handlers import (
+ PUBLIC_VIDEO_SHARE,
+ StatusDisplayStrings,
+ TranscriptProvider,
+ convert_video_status,
+ storage_service_bucket,
+ storage_service_key,
+)
+from common.djangoapps.student.tests.factories import UserFactory
+from openedx.core.djangoapps.profile_images.tests.helpers import make_image_file
+from openedx.core.djangoapps.video_pipeline.config.waffle import DEPRECATE_YOUTUBE, ENABLE_DEVSTACK_VIDEO_UPLOADS
+from openedx.core.djangoapps.waffle_utils.models import WaffleFlagCourseOverrideModel
+from xmodule.modulestore.django import modulestore
+from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
+from xmodule.modulestore.tests.factories import CourseFactory # lint-amnesty, pylint: disable=wrong-import-order
+
+from ..videos import KEY_EXPIRATION_IN_SECONDS, VIDEO_IMAGE_UPLOAD_ENABLED
+
+
+def setup_s3_mocks(mock_boto3_resource, bucket_name='test-bucket'):
+ """
+ Helper function to set up consistent boto3 S3 mocks.
+
+ Args:
+ mock_boto3_resource: The patched boto3.resource mock
+ bucket_name: Name for the mock bucket (default: 'test-bucket')
+
+ Returns:
+ tuple: (mock_s3_client, mock_bucket, mock_s3_resource)
+ """
+ mock_s3_client = Mock()
+ mock_bucket = Mock()
+ mock_bucket.name = bucket_name
+ mock_bucket.meta.client = mock_s3_client
+ mock_s3_resource = Mock()
+ mock_s3_resource.Bucket.return_value = mock_bucket
+ mock_boto3_resource.return_value = mock_s3_resource
+ return mock_s3_client, mock_bucket, mock_s3_resource
+
+
+class VideoUploadTestBase:
+ """
+ Test cases for the video upload feature
+ """
+
+ def get_url_for_course_key(self, course_key, kwargs=None):
+ """Return video handler URL for the given course"""
+ return reverse_course_url(self.VIEW_NAME, course_key, kwargs) # lint-amnesty, pylint: disable=no-member
+
+ def setUp(self):
+ super().setUp() # lint-amnesty, pylint: disable=no-member
+ self.url = self.get_url_for_course_key(self.course.id)
+ self.test_token = "test_token"
+ self.course.video_upload_pipeline = {
+ "course_video_upload_token": self.test_token,
+ }
+ self.save_course() # lint-amnesty, pylint: disable=no-member
+
+ # create another course for videos belonging to multiple courses
+ self.course2 = CourseFactory.create()
+ self.course2.video_upload_pipeline = {
+ "course_video_upload_token": self.test_token,
+ }
+ self.course2.save()
+ self.store.update_item(self.course2, self.user.id) # lint-amnesty, pylint: disable=no-member
+
+ # course ids for videos
+ course_ids = [str(self.course.id), str(self.course2.id)]
+ created = datetime.now(pytz.utc)
+
+ self.profiles = ["profile1", "profile2"]
+ self.previous_uploads = [
+ {
+ "edx_video_id": "test1",
+ "client_video_id": "test1.mp4",
+ "duration": 42.0,
+ "status": "upload",
+ "courses": course_ids,
+ "encoded_videos": [],
+ "created": created
+ },
+ {
+ "edx_video_id": "test2",
+ "client_video_id": "test2.mp4",
+ "duration": 128.0,
+ "status": "file_complete",
+ "courses": course_ids,
+ "created": created,
+ "encoded_videos": [
+ {
+ "profile": "profile1",
+ "url": "http://example.com/profile1/test2.mp4",
+ "file_size": 1600,
+ "bitrate": 100,
+ },
+ {
+ "profile": "profile2",
+ "url": "http://example.com/profile2/test2.mov",
+ "file_size": 16000,
+ "bitrate": 1000,
+ },
+ ],
+ },
+ {
+ "edx_video_id": "non-ascii",
+ "client_video_id": "nón-ascii-näme.mp4",
+ "duration": 256.0,
+ "status": "transcode_active",
+ "courses": course_ids,
+ "created": created,
+ "encoded_videos": [
+ {
+ "profile": "profile1",
+ "url": "http://example.com/profile1/nón-ascii-näme.mp4",
+ "file_size": 3200,
+ "bitrate": 100,
+ },
+ ]
+ },
+ ]
+ # Ensure every status string is tested
+ self.previous_uploads += [
+ {
+ "edx_video_id": f"status_test_{status}",
+ "client_video_id": "status_test.mp4",
+ "duration": 3.14,
+ "status": status,
+ "courses": course_ids,
+ "created": created,
+ "encoded_videos": [],
+ }
+ for status in (
+ list(StatusDisplayStrings._STATUS_MAP.keys()) + # pylint:disable=protected-access
+ ["non_existent_status"]
+ )
+ ]
+ for profile in self.profiles:
+ create_profile(profile)
+ for video in self.previous_uploads:
+ create_video(video)
+
+ def _get_previous_upload(self, edx_video_id):
+ """Returns the previous upload with the given video id."""
+ return next(
+ video
+ for video in self.previous_uploads
+ if video["edx_video_id"] == edx_video_id
+ )
+
+
+class VideoStudioAccessTestsMixin:
+ """
+ Base Access tests for studio video views
+ """
+ def test_anon_user(self):
+ self.client.logout()
+ response = self.client.get(self.url)
+ self.assertEqual(response.status_code, 302) # noqa: PT009
+
+ def test_put(self):
+ response = self.client.put(self.url)
+ self.assertEqual(response.status_code, 405) # noqa: PT009
+
+ def test_invalid_course_key(self):
+ response = self.client.get(
+ self.get_url_for_course_key("Non/Existent/Course")
+ )
+ self.assertEqual(response.status_code, 404) # noqa: PT009
+
+ def test_non_staff_user(self):
+ client, __ = self.create_non_staff_authed_user_client()
+ response = client.get(self.url)
+ self.assertEqual(response.status_code, 403) # noqa: PT009
+
+
+class VideoPipelineStudioAccessTestsMixin:
+ """
+ Access tests for video views that rely on the video pipeline
+ """
+ def test_video_pipeline_not_enabled(self):
+ settings.FEATURES["ENABLE_VIDEO_UPLOAD_PIPELINE"] = False
+ self.assertEqual(self.client.get(self.url).status_code, 404) # noqa: PT009
+
+ def test_video_pipeline_not_configured(self):
+ settings.VIDEO_UPLOAD_PIPELINE = None
+ self.assertEqual(self.client.get(self.url).status_code, 404) # noqa: PT009
+
+ def test_course_not_configured(self):
+ self.course.video_upload_pipeline = {}
+ self.save_course()
+ self.assertEqual(self.client.get(self.url).status_code, 404) # noqa: PT009
+
+
+class VideoUploadPostTestsMixin:
+ """
+ Shared test cases for video post tests.
+ """
+ @override_settings(AWS_ACCESS_KEY_ID='test_key_id', AWS_SECRET_ACCESS_KEY='test_secret')
+ @patch('cms.djangoapps.contentstore.video_storage_handlers.boto3.resource')
+ def test_post_success(self, mock_boto3_resource):
+ files = [
+ {
+ 'file_name': 'first.mp4',
+ 'content_type': 'video/mp4',
+ },
+ {
+ 'file_name': 'second.mp4',
+ 'content_type': 'video/mp4',
+ },
+ {
+ 'file_name': 'third.mov',
+ 'content_type': 'video/quicktime',
+ },
+ {
+ 'file_name': 'fourth.mp4',
+ 'content_type': 'video/mp4',
+ },
+ ]
+
+ # Setup boto3 mocks
+ mock_s3_client, mock_bucket, mock_s3_resource = setup_s3_mocks(mock_boto3_resource)
+
+ # Mock generate_presigned_url to return different URLs for each file
+ def mock_generate_presigned_url(operation, Params=None, ExpiresIn=None):
+ file_name = Params['Metadata']['client_video_id']
+ return f'http://example.com/url_{file_name}'
+
+ mock_s3_client.generate_presigned_url.side_effect = mock_generate_presigned_url
+
+ response = self.client.post(
+ self.url,
+ json.dumps({'files': files}),
+ content_type='application/json'
+ )
+ self.assertEqual(response.status_code, 200) # noqa: PT009
+ response_obj = json.loads(response.content.decode('utf-8'))
+
+ # Verify boto3 resource was called correctly
+ mock_boto3_resource.assert_called_once_with(
+ "s3",
+ aws_access_key_id=settings.AWS_ACCESS_KEY_ID,
+ aws_secret_access_key=settings.AWS_SECRET_ACCESS_KEY
+ )
+
+ self.assertEqual(len(response_obj['files']), len(files)) # noqa: PT009
+ self.assertEqual(mock_s3_client.generate_presigned_url.call_count, len(files)) # noqa: PT009
+
+ for i, file_info in enumerate(files):
+ # Get the call args for this file's presigned URL generation
+ call_args = mock_s3_client.generate_presigned_url.call_args_list[i]
+ args, kwargs = call_args
+
+ # Verify the operation and params
+ self.assertEqual(args[0], 'put_object') # noqa: PT009
+ self.assertEqual(kwargs['Params']['Bucket'], 'test-bucket') # noqa: PT009
+ self.assertEqual(kwargs['Params']['ContentType'], file_info['content_type']) # noqa: PT009
+ self.assertEqual(kwargs['ExpiresIn'], KEY_EXPIRATION_IN_SECONDS) # noqa: PT009
+
+ # Extract video_id from the key
+ key_name = kwargs['Params']['Key']
+ path_match = re.match(
+ (
+ settings.VIDEO_UPLOAD_PIPELINE['ROOT_PATH'] +
+ '/([a-f0-9]{8}-[a-f0-9]{4}-4[a-f0-9]{3}-[89ab][a-f0-9]{3}-[a-f0-9]{12})$'
+ ),
+ key_name
+ )
+ self.assertIsNotNone(path_match) # noqa: PT009
+ video_id = path_match.group(1)
+
+ # Verify metadata
+ metadata = kwargs['Params']['Metadata']
+ self.assertEqual(metadata['course_video_upload_token'], self.test_token) # noqa: PT009
+ self.assertEqual(metadata['client_video_id'], file_info['file_name']) # noqa: PT009
+ self.assertEqual(metadata['course_key'], str(self.course.id)) # noqa: PT009
+
+ # Ensure VAL was updated
+ val_info = get_video_info(video_id)
+ self.assertEqual(val_info['status'], 'upload') # noqa: PT009
+ self.assertEqual(val_info['client_video_id'], file_info['file_name']) # noqa: PT009
+ self.assertEqual(val_info['duration'], 0) # noqa: PT009
+ self.assertEqual(val_info['courses'], [{str(self.course.id): None}]) # noqa: PT009
+
+ # Ensure response is correct
+ response_file = response_obj['files'][i]
+ self.assertEqual(response_file['file_name'], file_info['file_name']) # noqa: PT009
+ self.assertEqual(response_file['upload_url'], f'http://example.com/url_{file_info["file_name"]}') # noqa: PT009
+
+ def test_post_non_json(self):
+ response = self.client.post(self.url, {"files": []})
+ self.assertEqual(response.status_code, 400) # noqa: PT009
+
+ def test_post_malformed_json(self):
+ response = self.client.post(self.url, "{", content_type="application/json")
+ self.assertEqual(response.status_code, 400) # noqa: PT009
+
+ def test_post_invalid_json(self):
+ def assert_bad(content):
+ """Make request with content and assert that response is 400"""
+ response = self.client.post(
+ self.url,
+ json.dumps(content),
+ content_type="application/json"
+ )
+ self.assertEqual(response.status_code, 400) # noqa: PT009
+
+ # Top level missing files key
+ assert_bad({})
+
+ # Entry missing file_name
+ assert_bad({"files": [{"content_type": "video/mp4"}]})
+
+ # Entry missing content_type
+ assert_bad({"files": [{"file_name": "test.mp4"}]})
+
+
+@ddt.ddt
+@patch.dict("django.conf.settings.FEATURES", {"ENABLE_VIDEO_UPLOAD_PIPELINE": True})
+@override_settings(VIDEO_UPLOAD_PIPELINE={
+ "VEM_S3_BUCKET": "vem_test_bucket", "BUCKET": "test_bucket", "ROOT_PATH": "test_root"
+})
+class VideosHandlerTestCase(
+ VideoUploadTestBase,
+ VideoStudioAccessTestsMixin,
+ VideoPipelineStudioAccessTestsMixin,
+ VideoUploadPostTestsMixin,
+ CourseTestCase
+):
+ """Test cases for the main video upload endpoint"""
+
+ VIEW_NAME = 'videos_handler'
+
+ def test_get_json(self):
+ response = self.client.get_json(self.url)
+ self.assertEqual(response.status_code, 200) # noqa: PT009
+ response_videos = json.loads(response.content.decode('utf-8'))['videos']
+ self.assertEqual(len(response_videos), len(self.previous_uploads)) # noqa: PT009
+ for i, response_video in enumerate(response_videos):
+ # Videos should be returned by creation date descending
+ original_video = self.previous_uploads[-(i + 1)]
+ print(response_video.keys())
+ self.assertEqual( # noqa: PT009
+ set(response_video.keys()),
+ {
+ 'edx_video_id',
+ 'client_video_id',
+ 'created',
+ 'duration',
+ 'status',
+ 'status_nontranslated',
+ 'course_video_image_url',
+ 'file_size',
+ 'download_link',
+ 'transcripts',
+ 'transcription_status',
+ 'transcript_urls',
+ 'error_description',
+ }
+ )
+ dateutil.parser.parse(response_video['created'])
+ for field in ['edx_video_id', 'client_video_id', 'duration']:
+ self.assertEqual(response_video[field], original_video[field]) # noqa: PT009
+ self.assertEqual( # noqa: PT009
+ response_video['status'],
+ convert_video_status(original_video)
+ )
+
+ @ddt.data(
+ (
+ [
+ 'edx_video_id', 'client_video_id', 'created', 'duration',
+ 'status', 'status_nontranslated', 'course_video_image_url', 'file_size',
+ 'download_link', 'transcripts', 'transcription_status', 'transcript_urls',
+ 'error_description'
+ ],
+ [
+ {
+ 'video_id': 'test1',
+ 'language_code': 'en',
+ 'file_name': 'edx101.srt',
+ 'file_format': 'srt',
+ 'provider': 'Cielo24'
+ }
+ ],
+ ['en']
+ ),
+ (
+ [
+ 'edx_video_id', 'client_video_id', 'created', 'duration',
+ 'status', 'status_nontranslated', 'course_video_image_url', 'file_size',
+ 'download_link', 'transcripts', 'transcription_status', 'transcript_urls',
+ 'error_description'
+ ],
+ [
+ {
+ 'video_id': 'test1',
+ 'language_code': 'en',
+ 'file_name': 'edx101_en.srt',
+ 'file_format': 'srt',
+ 'provider': 'Cielo24'
+ },
+ {
+ 'video_id': 'test1',
+ 'language_code': 'es',
+ 'file_name': 'edx101_es.srt',
+ 'file_format': 'srt',
+ 'provider': 'Cielo24'
+ }
+ ],
+ ['en', 'es']
+ )
+ )
+ @ddt.unpack
+ def test_get_json_transcripts(self, expected_video_keys, uploaded_transcripts, expected_transcripts):
+ """
+ Test that transcripts are attached based on whether the video transcript feature is enabled.
+ """
+ for transcript in uploaded_transcripts:
+ create_or_update_video_transcript(
+ transcript['video_id'],
+ transcript['language_code'],
+ metadata={
+ 'file_name': transcript['file_name'],
+ 'file_format': transcript['file_format'],
+ 'provider': transcript['provider']
+ }
+ )
+
+ response = self.client.get_json(self.url)
+ self.assertEqual(response.status_code, 200) # noqa: PT009
+ response_videos = json.loads(response.content.decode('utf-8'))['videos']
+ self.assertEqual(len(response_videos), len(self.previous_uploads)) # noqa: PT009
+ for response_video in response_videos:
+ print(response_video)
+
+ self.assertEqual(set(response_video.keys()), set(expected_video_keys)) # noqa: PT009
+ if response_video['edx_video_id'] == self.previous_uploads[0]['edx_video_id']:
+ self.assertEqual(response_video.get('transcripts', []), expected_transcripts) # noqa: PT009
+
+ def test_get_redirects_to_video_uploads_url(self):
+ """
+ Test that GET requests redirect to the MFE video uploads page.
+ """
+ from cms.djangoapps.contentstore.utils import get_video_uploads_url
+ response = self.client.get(self.url)
+ self.assertEqual(response.status_code, 302) # noqa: PT009
+ self.assertEqual(response.url, get_video_uploads_url(self.course.id)) # noqa: PT009
+
+ @override_settings(AWS_ACCESS_KEY_ID="test_key_id", AWS_SECRET_ACCESS_KEY="test_secret")
+ @patch("cms.djangoapps.contentstore.video_storage_handlers.boto3.resource")
+ @ddt.data(
+ (
+ [
+ {
+ "file_name": "supported-1.mp4",
+ "content_type": "video/mp4",
+ },
+ {
+ "file_name": "supported-2.mov",
+ "content_type": "video/quicktime",
+ },
+ ],
+ 200
+ ),
+ (
+ [
+ {
+ "file_name": "unsupported-1.txt",
+ "content_type": "text/plain",
+ },
+ {
+ "file_name": "unsupported-2.png",
+ "content_type": "image/png",
+ },
+ ],
+ 400
+ )
+ )
+ @ddt.unpack
+ def test_video_supported_file_formats(self, files, expected_status, mock_boto3_resource):
+ """
+ Test that video upload works correctly against supported and unsupported file formats.
+ """
+ # Setup boto3 mocks
+ mock_s3_client, mock_bucket, mock_s3_resource = setup_s3_mocks(mock_boto3_resource)
+
+ # Mock generate_presigned_url to return different URLs for each file
+ def mock_generate_presigned_url(operation, Params=None, ExpiresIn=None):
+ file_name = Params['Metadata']['client_video_id']
+ return f'http://example.com/url_{file_name}'
+
+ mock_s3_client.generate_presigned_url.side_effect = mock_generate_presigned_url
+
+ # Check supported formats
+ response = self.client.post(
+ self.url,
+ json.dumps({"files": files}),
+ content_type="application/json"
+ )
+ self.assertEqual(response.status_code, expected_status) # noqa: PT009
+ response = json.loads(response.content.decode('utf-8'))
+
+ if expected_status == 200:
+ self.assertNotIn('error', response) # noqa: PT009
+ else:
+ self.assertIn('error', response) # noqa: PT009
+ self.assertEqual(response['error'], "Request 'files' entry contain unsupported content_type") # noqa: PT009
+
+ @override_settings(AWS_ACCESS_KEY_ID='test_key_id', AWS_SECRET_ACCESS_KEY='test_secret')
+ @patch('cms.djangoapps.contentstore.video_storage_handlers.boto3.resource')
+ def test_upload_with_non_ascii_charaters(self, mock_boto3_resource):
+ """
+ Test that video uploads throws error message when file name contains special characters.
+ """
+ # Setup boto3 mocks
+ mock_s3_client, mock_bucket, mock_s3_resource = setup_s3_mocks(mock_boto3_resource)
+
+ file_name = 'test\u2019_file.mp4'
+ files = [{'file_name': file_name, 'content_type': 'video/mp4'}]
+
+ response = self.client.post(
+ self.url,
+ json.dumps({'files': files}),
+ content_type='application/json'
+ )
+ self.assertEqual(response.status_code, 400) # noqa: PT009
+ response = json.loads(response.content.decode('utf-8'))
+ self.assertEqual(response['error'], 'The file name for %s must contain only ASCII characters.' % file_name) # noqa: PT009, UP031
+
+ @override_settings(AWS_ACCESS_KEY_ID='test_key_id', AWS_SECRET_ACCESS_KEY='test_secret', AWS_SECURITY_TOKEN='token')
+ @patch('cms.djangoapps.contentstore.video_storage_handlers.boto3.resource')
+ @override_waffle_flag(ENABLE_DEVSTACK_VIDEO_UPLOADS, active=True)
+ def test_devstack_upload_connection(self, mock_boto3_resource):
+ files = [{'file_name': 'first.mp4', 'content_type': 'video/mp4'}]
+
+ # Setup boto3 mocks
+ mock_s3_client, mock_bucket, mock_s3_resource = setup_s3_mocks(mock_boto3_resource)
+
+ # Mock generate_presigned_url to return different URLs for each file
+ def mock_generate_presigned_url(operation, Params=None, ExpiresIn=None):
+ file_name = Params['Metadata']['client_video_id']
+ return f'http://example.com/url_{file_name}'
+
+ mock_s3_client.generate_presigned_url.side_effect = mock_generate_presigned_url
+
+ response = self.client.post(
+ self.url,
+ json.dumps({'files': files}),
+ content_type='application/json'
+ )
+
+ self.assertEqual(response.status_code, 200) # noqa: PT009
+ mock_boto3_resource.assert_called_once_with(
+ "s3",
+ aws_access_key_id=settings.AWS_ACCESS_KEY_ID,
+ aws_secret_access_key=settings.AWS_SECRET_ACCESS_KEY,
+ security_token=settings.AWS_SECURITY_TOKEN
+ )
+
+ @patch('cms.djangoapps.contentstore.video_storage_handlers.boto3.resource')
+ def test_send_course_to_vem_pipeline(self, mock_boto3_resource):
+ """
+ Test that uploads always go to VEM S3 bucket by default.
+ """
+ files = [{'file_name': 'first.mp4', 'content_type': 'video/mp4'}]
+
+ # Setup boto3 mocks
+ mock_s3_client, mock_bucket, mock_s3_resource = setup_s3_mocks(mock_boto3_resource)
+
+ # Mock generate_presigned_url to return different URLs for each file
+ def mock_generate_presigned_url(operation, Params=None, ExpiresIn=None):
+ file_name = Params['Metadata']['client_video_id']
+ return f'http://example.com/url_{file_name}'
+
+ mock_s3_client.generate_presigned_url.side_effect = mock_generate_presigned_url
+
+ response = self.client.post(
+ self.url,
+ json.dumps({'files': files}),
+ content_type='application/json'
+ )
+
+ self.assertEqual(response.status_code, 200) # noqa: PT009
+ mock_s3_resource.Bucket.assert_called_once_with(
+ settings.VIDEO_UPLOAD_PIPELINE['VEM_S3_BUCKET'] # pylint: disable=unsubscriptable-object
+ )
+
+ @override_settings(AWS_ACCESS_KEY_ID='test_key_id', AWS_SECRET_ACCESS_KEY='test_secret')
+ @patch('cms.djangoapps.contentstore.video_storage_handlers.boto3.resource')
+ @ddt.data(
+ {
+ 'global_waffle': True,
+ 'course_override': WaffleFlagCourseOverrideModel.ALL_CHOICES.off,
+ 'expect_token': True
+ },
+ {
+ 'global_waffle': False,
+ 'course_override': WaffleFlagCourseOverrideModel.ALL_CHOICES.on,
+ 'expect_token': False
+ },
+ {
+ 'global_waffle': False,
+ 'course_override': WaffleFlagCourseOverrideModel.ALL_CHOICES.off,
+ 'expect_token': True
+ }
+ )
+ def test_video_upload_token_in_meta(self, data, mock_boto3_resource):
+ """
+ Test video upload token in s3 metadata.
+ """
+ @contextmanager
+ def proxy_manager(manager, ignore_manager):
+ """
+ This acts as proxy to the original manager in the arguments given
+ the original manager is not set to be ignored.
+ """
+ if ignore_manager:
+ yield
+ else:
+ with manager:
+ yield
+
+ file_data = {
+ 'file_name': 'first.mp4',
+ 'content_type': 'video/mp4',
+ }
+
+ # Setup boto3 mocks
+ mock_s3_client, mock_bucket, mock_s3_resource = setup_s3_mocks(mock_boto3_resource)
+
+ # Track generate_presigned_url calls to inspect metadata
+ presigned_url_calls = []
+
+ def mock_generate_presigned_url(operation, Params=None, ExpiresIn=None):
+ presigned_url_calls.append((operation, Params, ExpiresIn))
+ file_name = Params['Metadata']['client_video_id']
+ return f'http://example.com/url_{file_name}'
+
+ mock_s3_client.generate_presigned_url.side_effect = mock_generate_presigned_url
+
+ with patch.object(WaffleFlagCourseOverrideModel, 'override_value', return_value=data['course_override']):
+ with override_waffle_flag(DEPRECATE_YOUTUBE, active=data['global_waffle']):
+ response = self.client.post(
+ self.url,
+ json.dumps({'files': [file_data]}),
+ content_type='application/json'
+ )
+ self.assertEqual(response.status_code, 200) # noqa: PT009
+
+ # Check if course_video_upload_token is in metadata based on expectation
+ if data['expect_token']:
+ # We should find the token in the metadata
+ self.assertEqual(len(presigned_url_calls), 1) # noqa: PT009
+ metadata = presigned_url_calls[0][1]['Metadata']
+ self.assertIn('course_video_upload_token', metadata) # noqa: PT009
+ self.assertEqual(metadata['course_video_upload_token'], self.test_token) # noqa: PT009
+ else:
+ # If we don't expect a token, verify it's not in metadata
+ if presigned_url_calls:
+ metadata = presigned_url_calls[0][1]['Metadata']
+ self.assertNotIn('course_video_upload_token', metadata) # noqa: PT009
+
+ def _assert_video_removal(self, url, edx_video_id, deleted_videos):
+ """
+ Verify that if correct video is removed from a particular course.
+
+ Arguments:
+ url (str): URL to get uploaded videos
+ edx_video_id (str): video id
+ deleted_videos (int): how many videos are deleted
+ """
+ response = self.client.get_json(url)
+ self.assertEqual(response.status_code, 200) # noqa: PT009
+ response_videos = json.loads(response.content.decode('utf-8'))["videos"]
+ self.assertEqual(len(response_videos), len(self.previous_uploads) - deleted_videos) # noqa: PT009
+
+ if deleted_videos:
+ self.assertNotIn(edx_video_id, [video.get('edx_video_id') for video in response_videos]) # noqa: PT009
+ else:
+ self.assertIn(edx_video_id, [video.get('edx_video_id') for video in response_videos]) # noqa: PT009
+
+ def test_video_removal(self):
+ """
+ Verifies that video removal is working as expected.
+ """
+ edx_video_id = 'test1'
+ remove_url = self.get_url_for_course_key(self.course.id, {'edx_video_id': edx_video_id})
+ response = self.client.delete(remove_url, HTTP_ACCEPT="application/json")
+ self.assertEqual(response.status_code, 204) # noqa: PT009
+
+ self._assert_video_removal(self.url, edx_video_id, 1)
+
+ def test_video_removal_multiple_courses(self):
+ """
+ Verifies that video removal is working as expected for multiple courses.
+
+ If a video is used by multiple courses then removal from one course shouldn't effect the other course.
+ """
+ # remove video from course1
+ edx_video_id = 'test1'
+ remove_url = self.get_url_for_course_key(self.course.id, {'edx_video_id': edx_video_id})
+ response = self.client.delete(remove_url, HTTP_ACCEPT="application/json")
+ self.assertEqual(response.status_code, 204) # noqa: PT009
+
+ # verify that video is only deleted from course1 only
+ self._assert_video_removal(self.url, edx_video_id, 1)
+ self._assert_video_removal(self.get_url_for_course_key(self.course2.id), edx_video_id, 0)
+
+ def test_convert_video_status(self):
+ """
+ Verifies that convert_video_status works as expected.
+ """
+ video = self.previous_uploads[0]
+
+ # video status should be failed if it's in upload state for more than 24 hours
+ video['created'] = datetime(2016, 1, 1, 10, 10, 10, 0, pytz.UTC)
+ status = convert_video_status(video)
+ self.assertEqual(status, StatusDisplayStrings.get('upload_failed')) # noqa: PT009
+
+ # `invalid_token` should be converted to `youtube_duplicate`
+ video['created'] = datetime.now(pytz.UTC)
+ video['status'] = 'invalid_token'
+ status = convert_video_status(video)
+ self.assertEqual(status, StatusDisplayStrings.get('youtube_duplicate')) # noqa: PT009
+
+ # The "encode status" should be converted to `file_complete` if video encodes are complete
+ video['status'] = 'transcription_in_progress'
+ status = convert_video_status(video, is_video_encodes_ready=True)
+ self.assertEqual(status, StatusDisplayStrings.get('file_complete')) # noqa: PT009
+
+ # If encoding is not complete return the status as it is
+ video['status'] = 's3_upload_failed'
+ status = convert_video_status(video)
+ self.assertEqual(status, StatusDisplayStrings.get('s3_upload_failed')) # noqa: PT009
+
+ # for all other status, there should not be any conversion
+ statuses = list(StatusDisplayStrings._STATUS_MAP.keys()) # pylint: disable=protected-access
+ statuses.remove('invalid_token')
+ for status in statuses:
+ video['status'] = status
+ new_status = convert_video_status(video)
+ self.assertEqual(new_status, StatusDisplayStrings.get(status)) # noqa: PT009
+
+ def assert_video_status(self, url, edx_video_id, status):
+ """
+ Verifies that video with `edx_video_id` has `status`
+ """
+ response = self.client.get_json(url)
+ self.assertEqual(response.status_code, 200) # noqa: PT009
+ videos = json.loads(response.content.decode('utf-8'))["videos"]
+ for video in videos:
+ if video['edx_video_id'] == edx_video_id:
+ return self.assertEqual(video['status'], status) # noqa: PT009
+
+ # Test should fail if video not found
+ self.assertEqual(True, False, 'Invalid edx_video_id') # noqa: PT009
+
+ @patch('cms.djangoapps.contentstore.video_storage_handlers.LOGGER')
+ def test_video_status_update_request(self, mock_logger):
+ """
+ Verifies that video status update request works as expected.
+ """
+ url = self.get_url_for_course_key(self.course.id)
+ edx_video_id = 'test1'
+ self.assert_video_status(url, edx_video_id, 'Uploading')
+
+ response = self.client.post(
+ url,
+ json.dumps([{
+ 'edxVideoId': edx_video_id,
+ 'status': 'upload_failed',
+ 'message': 'server down'
+ }]),
+ content_type="application/json"
+ )
+
+ mock_logger.info.assert_called_with(
+ 'VIDEOS: Video status update with id [%s], status [%s] and message [%s]',
+ edx_video_id,
+ 'upload_failed',
+ 'server down'
+ )
+
+ self.assertEqual(response.status_code, 204) # noqa: PT009
+
+ self.assert_video_status(url, edx_video_id, 'Failed')
+
+ @ddt.data(
+ ('test_video_token', "Transcription in Progress"),
+ ('', "Ready"),
+ )
+ @ddt.unpack
+ def test_video_transcript_status_conversion(self, course_video_upload_token, expected_video_status_text):
+ """
+ Verifies that video status `transcription_in_progress` gets converted
+ correctly into the `file_complete` for the new video workflow and
+ stays as it is, for the old video workflow.
+ """
+ self.course.video_upload_pipeline = {
+ 'course_video_upload_token': course_video_upload_token
+ }
+ self.save_course()
+
+ url = self.get_url_for_course_key(self.course.id)
+ edx_video_id = 'test1'
+ self.assert_video_status(url, edx_video_id, 'Uploading')
+
+ response = self.client.post(
+ url,
+ json.dumps([{
+ 'edxVideoId': edx_video_id,
+ 'status': 'transcription_in_progress',
+ 'message': 'Transcription is in progress'
+ }]),
+ content_type="application/json"
+ )
+ self.assertEqual(response.status_code, 204) # noqa: PT009
+
+ self.assert_video_status(url, edx_video_id, expected_video_status_text)
+
+
+@ddt.ddt
+@patch.dict("django.conf.settings.FEATURES", {"ENABLE_VIDEO_UPLOAD_PIPELINE": True})
+@override_settings(VIDEO_UPLOAD_PIPELINE={
+ "VEM_S3_BUCKET": "vem_test_bucket", "BUCKET": "test_bucket", "ROOT_PATH": "test_root"
+})
+class GenerateVideoUploadLinkTestCase(
+ VideoUploadTestBase,
+ VideoUploadPostTestsMixin,
+ CourseTestCase
+):
+ """
+ Test cases for the main video upload endpoint
+ """
+
+ VIEW_NAME = 'generate_video_upload_link'
+
+ def test_unsupported_requests_fail(self):
+ """
+ The API only supports post, make sure other requests fail
+ """
+ response = self.client.get(self.url)
+ self.assertEqual(response.status_code, 405) # noqa: PT009
+
+ response = self.client.put(self.url)
+ self.assertEqual(response.status_code, 405) # noqa: PT009
+
+ response = self.client.patch(self.url)
+ self.assertEqual(response.status_code, 405) # noqa: PT009
+
+
+@ddt.ddt
+@patch.dict('django.conf.settings.FEATURES', {'ENABLE_VIDEO_UPLOAD_PIPELINE': True})
+@override_settings(VIDEO_UPLOAD_PIPELINE={'BUCKET': 'test_bucket', 'ROOT_PATH': 'test_root'})
+class VideoImageTestCase(VideoUploadTestBase, CourseTestCase):
+ """
+ Tests for video image.
+ """
+
+ VIEW_NAME = "video_images_handler"
+
+ def verify_image_upload_reponse(self, course_id, edx_video_id, upload_response):
+ """
+ Verify that image is uploaded successfully.
+
+ Arguments:
+ course_id: ID of course
+ edx_video_id: ID of video
+ upload_response: Upload response object
+
+ Returns:
+ uploaded image url
+ """
+ self.assertEqual(upload_response.status_code, 200) # noqa: PT009
+ response = json.loads(upload_response.content.decode('utf-8'))
+ val_image_url = get_course_video_image_url(course_id=course_id, edx_video_id=edx_video_id)
+ self.assertEqual(response['image_url'], val_image_url) # noqa: PT009
+
+ return val_image_url
+
+ def verify_error_message(self, response, error_message):
+ """
+ Verify that image upload failure gets proper error message.
+
+ Arguments:
+ response: Response object.
+ error_message: Expected error message.
+ """
+ self.assertEqual(response.status_code, 400) # noqa: PT009
+ response = json.loads(response.content.decode('utf-8'))
+ self.assertIn('error', response) # noqa: PT009
+ self.assertEqual(response['error'], error_message) # noqa: PT009
+
+ @override_waffle_switch(VIDEO_IMAGE_UPLOAD_ENABLED, False)
+ def test_video_image_upload_disabled(self):
+ """
+ Tests the video image upload when the feature is disabled.
+ """
+ video_image_upload_url = self.get_url_for_course_key(self.course.id, {'edx_video_id': 'test_vid_id'})
+ response = self.client.post(video_image_upload_url, {'file': 'dummy_file'}, format='multipart')
+ self.assertEqual(response.status_code, 404) # noqa: PT009
+
+ @override_waffle_switch(VIDEO_IMAGE_UPLOAD_ENABLED, True)
+ def test_video_image(self):
+ """
+ Test video image is saved.
+ """
+ edx_video_id = 'test1'
+ video_image_upload_url = self.get_url_for_course_key(self.course.id, {'edx_video_id': edx_video_id})
+ with make_image_file(
+ dimensions=(settings.VIDEO_IMAGE_MIN_WIDTH, settings.VIDEO_IMAGE_MIN_HEIGHT),
+ ) as image_file:
+ response = self.client.post(video_image_upload_url, {'file': image_file}, format='multipart')
+ image_url1 = self.verify_image_upload_reponse(self.course.id, edx_video_id, response)
+
+ # upload again to verify that new image is uploaded successfully
+ with make_image_file(
+ dimensions=(settings.VIDEO_IMAGE_MIN_WIDTH, settings.VIDEO_IMAGE_MIN_HEIGHT),
+ ) as image_file:
+ response = self.client.post(video_image_upload_url, {'file': image_file}, format='multipart')
+ image_url2 = self.verify_image_upload_reponse(self.course.id, edx_video_id, response)
+
+ self.assertNotEqual(image_url1, image_url2) # noqa: PT009
+
+ @override_waffle_switch(VIDEO_IMAGE_UPLOAD_ENABLED, True)
+ def test_video_image_no_file(self):
+ """
+ Test that an error error message is returned if upload request is incorrect.
+ """
+ video_image_upload_url = self.get_url_for_course_key(self.course.id, {'edx_video_id': 'test1'})
+ response = self.client.post(video_image_upload_url, {})
+ self.verify_error_message(response, 'An image file is required.')
+
+ @override_waffle_switch(VIDEO_IMAGE_UPLOAD_ENABLED, True)
+ def test_no_video_image(self):
+ """
+ Test image url is set to None if no video image.
+ """
+ edx_video_id = 'test1'
+ get_videos_url = reverse_course_url('videos_handler', self.course.id)
+ video_image_upload_url = self.get_url_for_course_key(self.course.id, {'edx_video_id': edx_video_id})
+ with make_image_file(
+ dimensions=(settings.VIDEO_IMAGE_MIN_WIDTH, settings.VIDEO_IMAGE_MIN_HEIGHT),
+ ) as image_file:
+ self.client.post(video_image_upload_url, {'file': image_file}, format='multipart')
+
+ val_image_url = get_course_video_image_url(course_id=self.course.id, edx_video_id=edx_video_id)
+
+ response = self.client.get_json(get_videos_url)
+ self.assertEqual(response.status_code, 200) # noqa: PT009
+ response_videos = json.loads(response.content.decode('utf-8'))["videos"]
+ for response_video in response_videos:
+ if response_video['edx_video_id'] == edx_video_id:
+ self.assertEqual(response_video['course_video_image_url'], val_image_url) # noqa: PT009
+ else:
+ self.assertEqual(response_video['course_video_image_url'], None) # noqa: PT009
+
+ @ddt.data(
+ # Image file type validation
+ (
+ {
+ 'extension': '.png'
+ },
+ None
+ ),
+ (
+ {
+ 'extension': '.gif'
+ },
+ None
+ ),
+ (
+ {
+ 'extension': '.bmp'
+ },
+ None
+ ),
+ (
+ {
+ 'extension': '.jpg'
+ },
+ None
+ ),
+ (
+ {
+ 'extension': '.jpeg'
+ },
+ None
+ ),
+ (
+ {
+ 'extension': '.PNG'
+ },
+ None
+ ),
+ (
+ {
+ 'extension': '.tiff'
+ },
+ 'This image file type is not supported. Supported file types are {supported_file_formats}.'.format( # noqa: UP032
+ supported_file_formats=list(settings.VIDEO_IMAGE_SUPPORTED_FILE_FORMATS.keys())
+ )
+ ),
+ # Image file size validation
+ (
+ {
+ 'size': settings.VIDEO_IMAGE_SETTINGS['VIDEO_IMAGE_MAX_BYTES'] + 10
+ },
+ 'This image file must be smaller than {image_max_size}.'.format( # noqa: UP032
+ image_max_size=settings.VIDEO_IMAGE_MAX_FILE_SIZE_MB
+ )
+ ),
+ (
+ {
+ 'size': settings.VIDEO_IMAGE_SETTINGS['VIDEO_IMAGE_MIN_BYTES'] - 10
+ },
+ 'This image file must be larger than {image_min_size}.'.format( # noqa: UP032
+ image_min_size=settings.VIDEO_IMAGE_MIN_FILE_SIZE_KB
+ )
+ ),
+ # Image file minimum width / height
+ (
+ {
+ 'width': 16, # 16x9
+ 'height': 9
+ },
+ 'Recommended image resolution is {image_file_max_width}x{image_file_max_height}. The minimum resolution is {image_file_min_width}x{image_file_min_height}.'.format( # noqa: E501, UP032
+ image_file_max_width=settings.VIDEO_IMAGE_MAX_WIDTH,
+ image_file_max_height=settings.VIDEO_IMAGE_MAX_HEIGHT,
+ image_file_min_width=settings.VIDEO_IMAGE_MIN_WIDTH,
+ image_file_min_height=settings.VIDEO_IMAGE_MIN_HEIGHT
+ )
+ ),
+ (
+ {
+ 'width': settings.VIDEO_IMAGE_MIN_WIDTH - 10,
+ 'height': settings.VIDEO_IMAGE_MIN_HEIGHT
+ },
+ 'Recommended image resolution is {image_file_max_width}x{image_file_max_height}. The minimum resolution is {image_file_min_width}x{image_file_min_height}.'.format( # noqa: E501, UP032
+ image_file_max_width=settings.VIDEO_IMAGE_MAX_WIDTH,
+ image_file_max_height=settings.VIDEO_IMAGE_MAX_HEIGHT,
+ image_file_min_width=settings.VIDEO_IMAGE_MIN_WIDTH,
+ image_file_min_height=settings.VIDEO_IMAGE_MIN_HEIGHT
+ )
+ ),
+ (
+ {
+ 'width': settings.VIDEO_IMAGE_MIN_WIDTH,
+ 'height': settings.VIDEO_IMAGE_MIN_HEIGHT - 10
+ },
+ ( # noqa: UP032
+ 'Recommended image resolution is {image_file_max_width}x{image_file_max_height}. '
+ 'The minimum resolution is {image_file_min_width}x{image_file_min_height}.'
+ ).format(
+ image_file_max_width=settings.VIDEO_IMAGE_MAX_WIDTH,
+ image_file_max_height=settings.VIDEO_IMAGE_MAX_HEIGHT,
+ image_file_min_width=settings.VIDEO_IMAGE_MIN_WIDTH,
+ image_file_min_height=settings.VIDEO_IMAGE_MIN_HEIGHT
+ )
+ ),
+ (
+ {
+ 'width': 1200, # not 16:9, but width/height check first.
+ 'height': 100
+ },
+ ( # noqa: UP032
+ 'Recommended image resolution is {image_file_max_width}x{image_file_max_height}. '
+ 'The minimum resolution is {image_file_min_width}x{image_file_min_height}.'
+ ).format(
+ image_file_max_width=settings.VIDEO_IMAGE_MAX_WIDTH,
+ image_file_max_height=settings.VIDEO_IMAGE_MAX_HEIGHT,
+ image_file_min_width=settings.VIDEO_IMAGE_MIN_WIDTH,
+ image_file_min_height=settings.VIDEO_IMAGE_MIN_HEIGHT
+ )
+ ),
+ # Image file aspect ratio validation
+ (
+ {
+ 'width': settings.VIDEO_IMAGE_MAX_WIDTH, # 1280x720
+ 'height': settings.VIDEO_IMAGE_MAX_HEIGHT
+ },
+ None
+ ),
+ (
+ {
+ 'width': 850, # 16:9
+ 'height': 478
+ },
+ None
+ ),
+ (
+ {
+ 'width': 940, # 1.67 ratio, applicable aspect ratio margin of .01
+ 'height': 560
+ },
+ None
+ ),
+ (
+ {
+ 'width': settings.VIDEO_IMAGE_MIN_WIDTH + 100,
+ 'height': settings.VIDEO_IMAGE_MIN_HEIGHT + 200
+ },
+ 'This image file must have an aspect ratio of {video_image_aspect_ratio_text}.'.format( # noqa: UP032
+ video_image_aspect_ratio_text=settings.VIDEO_IMAGE_ASPECT_RATIO_TEXT
+ )
+ ),
+ # Image file name validation
+ (
+ {
+ 'prefix': 'nøn-åßç¡¡'
+ },
+ 'The image file name can only contain letters, numbers, hyphens (-), and underscores (_).'
+ )
+ )
+ @ddt.unpack
+ @override_waffle_switch(VIDEO_IMAGE_UPLOAD_ENABLED, True)
+ def test_video_image_validation_message(self, image_data, error_message):
+ """
+ Test video image validation gives proper error message.
+
+ Arguments:
+ image_data (Dict): Specific data to create image file.
+ error_message (String): Error message
+ """
+ edx_video_id = 'test1'
+ video_image_upload_url = self.get_url_for_course_key(self.course.id, {'edx_video_id': edx_video_id})
+ with make_image_file(
+ dimensions=(
+ image_data.get('width', settings.VIDEO_IMAGE_MIN_WIDTH),
+ image_data.get('height', settings.VIDEO_IMAGE_MIN_HEIGHT)
+ ),
+ prefix=image_data.get('prefix', 'videoimage'),
+ extension=image_data.get('extension', '.png'),
+ force_size=image_data.get('size', settings.VIDEO_IMAGE_SETTINGS['VIDEO_IMAGE_MIN_BYTES'])
+ ) as image_file:
+ response = self.client.post(video_image_upload_url, {'file': image_file}, format='multipart')
+ if error_message:
+ self.verify_error_message(response, error_message)
+ else:
+ self.verify_image_upload_reponse(self.course.id, edx_video_id, response)
+
+
+@ddt.ddt
+@patch(
+ 'openedx.core.djangoapps.video_config.models.VideoTranscriptEnabledFlag.feature_enabled',
+ Mock(return_value=True)
+)
+@patch.dict('django.conf.settings.FEATURES', {'ENABLE_VIDEO_UPLOAD_PIPELINE': True})
+class TranscriptPreferencesTestCase(VideoUploadTestBase, CourseTestCase):
+ """
+ Tests for video transcripts preferences.
+ """
+
+ VIEW_NAME = 'transcript_preferences_handler'
+
+ def test_405_with_not_allowed_request_method(self):
+ """
+ Verify that 405 is returned in case of not-allowed request methods.
+ Allowed request methods are POST and DELETE.
+ """
+ video_transcript_url = self.get_url_for_course_key(self.course.id)
+ response = self.client.get(
+ video_transcript_url,
+ content_type='application/json'
+ )
+ self.assertEqual(response.status_code, 405) # noqa: PT009
+
+ @ddt.data(
+ # Video transcript feature disabled
+ (
+ {},
+ False,
+ '',
+ 404,
+ ),
+ # Error cases
+ (
+ {},
+ True,
+ "Invalid provider None.",
+ 400
+ ),
+ (
+ {
+ 'provider': ''
+ },
+ True,
+ "Invalid provider .",
+ 400
+ ),
+ (
+ {
+ 'provider': 'dummy-provider'
+ },
+ True,
+ "Invalid provider dummy-provider.",
+ 400
+ ),
+ (
+ {
+ 'provider': TranscriptProvider.CIELO24
+ },
+ True,
+ "Invalid cielo24 fidelity None.",
+ 400
+ ),
+ (
+ {
+ 'provider': TranscriptProvider.CIELO24,
+ 'cielo24_fidelity': 'PROFESSIONAL',
+ },
+ True,
+ "Invalid cielo24 turnaround None.",
+ 400
+ ),
+ (
+ {
+ 'provider': TranscriptProvider.CIELO24,
+ 'cielo24_fidelity': 'PROFESSIONAL',
+ 'cielo24_turnaround': 'STANDARD',
+ 'video_source_language': 'en'
+ },
+ True,
+ "Invalid languages [].",
+ 400
+ ),
+ (
+ {
+ 'provider': TranscriptProvider.CIELO24,
+ 'cielo24_fidelity': 'PREMIUM',
+ 'cielo24_turnaround': 'STANDARD',
+ 'video_source_language': 'es'
+ },
+ True,
+ "Unsupported source language es.",
+ 400
+ ),
+ (
+ {
+ 'provider': TranscriptProvider.CIELO24,
+ 'cielo24_fidelity': 'PROFESSIONAL',
+ 'cielo24_turnaround': 'STANDARD',
+ 'video_source_language': 'en',
+ 'preferred_languages': ['es', 'ur']
+ },
+ True,
+ "Invalid languages ['es', 'ur'].",
+ 400
+ ),
+ (
+ {
+ 'provider': TranscriptProvider.THREE_PLAY_MEDIA
+ },
+ True,
+ "Invalid 3play turnaround None.",
+ 400
+ ),
+ (
+ {
+ 'provider': TranscriptProvider.THREE_PLAY_MEDIA,
+ 'three_play_turnaround': 'standard',
+ 'video_source_language': 'zh',
+ },
+ True,
+ "Unsupported source language zh.",
+ 400
+ ),
+ (
+ {
+ 'provider': TranscriptProvider.THREE_PLAY_MEDIA,
+ 'three_play_turnaround': 'standard',
+ 'video_source_language': 'es',
+ 'preferred_languages': ['es', 'ur']
+ },
+ True,
+ "Invalid languages ['es', 'ur'].",
+ 400
+ ),
+ (
+ {
+ 'provider': TranscriptProvider.THREE_PLAY_MEDIA,
+ 'three_play_turnaround': 'standard',
+ 'video_source_language': 'en',
+ 'preferred_languages': ['es', 'ur']
+ },
+ True,
+ "Invalid languages ['es', 'ur'].",
+ 400
+ ),
+ # Success
+ (
+ {
+ 'provider': TranscriptProvider.CIELO24,
+ 'cielo24_fidelity': 'PROFESSIONAL',
+ 'cielo24_turnaround': 'STANDARD',
+ 'video_source_language': 'es',
+ 'preferred_languages': ['en']
+ },
+ True,
+ '',
+ 200
+ ),
+ (
+ {
+ 'provider': TranscriptProvider.THREE_PLAY_MEDIA,
+ 'three_play_turnaround': 'standard',
+ 'preferred_languages': ['en'],
+ 'video_source_language': 'en',
+ },
+ True,
+ '',
+ 200
+ )
+ )
+ @ddt.unpack
+ def test_video_transcript(self, preferences, is_video_transcript_enabled, error_message, expected_status_code):
+ """
+ Tests that transcript handler works correctly.
+ """
+ video_transcript_url = self.get_url_for_course_key(self.course.id)
+ preferences_data = {
+ 'provider': preferences.get('provider'),
+ 'cielo24_fidelity': preferences.get('cielo24_fidelity'),
+ 'cielo24_turnaround': preferences.get('cielo24_turnaround'),
+ 'three_play_turnaround': preferences.get('three_play_turnaround'),
+ 'preferred_languages': preferences.get('preferred_languages', []),
+ 'video_source_language': preferences.get('video_source_language'),
+ }
+
+ with patch(
+ 'openedx.core.djangoapps.video_config.models.VideoTranscriptEnabledFlag.feature_enabled'
+ ) as video_transcript_feature:
+ video_transcript_feature.return_value = is_video_transcript_enabled
+ response = self.client.post(
+ video_transcript_url,
+ json.dumps(preferences_data),
+ content_type='application/json'
+ )
+ status_code = response.status_code
+ response = json.loads(response.content.decode('utf-8')) if is_video_transcript_enabled else response
+
+ self.assertEqual(status_code, expected_status_code) # noqa: PT009
+ self.assertEqual(response.get('error', ''), error_message) # noqa: PT009
+
+ # Remove modified and course_id fields from the response so as to check the expected transcript preferences.
+ response.get('transcript_preferences', {}).pop('modified', None)
+ response.get('transcript_preferences', {}).pop('course_id', None)
+ expected_preferences = preferences_data if is_video_transcript_enabled and not error_message else {}
+ self.assertDictEqual(response.get('transcript_preferences', {}), expected_preferences) # noqa: PT009
+
+ def test_remove_transcript_preferences(self):
+ """
+ Test that transcript handler removes transcript preferences correctly.
+ """
+ # First add course wide transcript preferences.
+ preferences = create_or_update_transcript_preferences(str(self.course.id))
+
+ # Verify transcript preferences exist
+ self.assertIsNotNone(preferences) # noqa: PT009
+
+ response = self.client.delete(
+ self.get_url_for_course_key(self.course.id),
+ content_type='application/json'
+ )
+
+ self.assertEqual(response.status_code, 204) # noqa: PT009
+
+ # Verify transcript preferences no loger exist
+ preferences = get_transcript_preferences(str(self.course.id))
+ self.assertIsNone(preferences) # noqa: PT009
+
+ def test_remove_transcript_preferences_not_found(self):
+ """
+ Test that transcript handler works correctly even when no preferences are found.
+ """
+ course_id = 'course-v1:dummy+course+id'
+ # Verify transcript preferences do not exist
+ preferences = get_transcript_preferences(course_id)
+ self.assertIsNone(preferences) # noqa: PT009
+
+ response = self.client.delete(
+ self.get_url_for_course_key(course_id),
+ content_type='application/json'
+ )
+ self.assertEqual(response.status_code, 204) # noqa: PT009
+
+ # Verify transcript preferences do not exist
+ preferences = get_transcript_preferences(course_id)
+ self.assertIsNone(preferences) # noqa: PT009
+
+ @ddt.data(
+ (
+ None,
+ False
+ ),
+ (
+ {
+ 'provider': TranscriptProvider.CIELO24,
+ 'cielo24_fidelity': 'PROFESSIONAL',
+ 'cielo24_turnaround': 'STANDARD',
+ 'preferred_languages': ['en']
+ },
+ False
+ ),
+ (
+ {
+ 'provider': TranscriptProvider.CIELO24,
+ 'cielo24_fidelity': 'PROFESSIONAL',
+ 'cielo24_turnaround': 'STANDARD',
+ 'preferred_languages': ['en']
+ },
+ True
+ )
+ )
+ @ddt.unpack
+ @override_settings(AWS_ACCESS_KEY_ID='test_key_id', AWS_SECRET_ACCESS_KEY='test_secret')
+ @patch('cms.djangoapps.contentstore.video_storage_handlers.get_transcript_preferences')
+ @patch('cms.djangoapps.contentstore.video_storage_handlers.boto3.resource')
+ def test_transcript_preferences_metadata(self, transcript_preferences, is_video_transcript_enabled,
+ mock_boto3_resource, mock_transcript_preferences):
+ """
+ Tests that transcript preference metadata is only set if it is video transcript feature is enabled and
+ transcript preferences are already stored in the system.
+ """
+ file_name = 'test-video.mp4'
+ request_data = {'files': [{'file_name': file_name, 'content_type': 'video/mp4'}]}
+
+ mock_transcript_preferences.return_value = transcript_preferences
+
+ # Setup boto3 mocks
+ mock_s3_client, mock_bucket, mock_s3_resource = setup_s3_mocks(mock_boto3_resource)
+
+ # Track generate_presigned_url calls to inspect metadata
+ presigned_url_calls = []
+
+ def mock_generate_presigned_url(operation, Params=None, ExpiresIn=None):
+ presigned_url_calls.append((operation, Params, ExpiresIn))
+ file_name = Params['Metadata']['client_video_id']
+ return f'http://example.com/url_{file_name}'
+
+ mock_s3_client.generate_presigned_url.side_effect = mock_generate_presigned_url
+
+ videos_handler_url = reverse_course_url('videos_handler', self.course.id)
+ with patch(
+ 'openedx.core.djangoapps.video_config.models.VideoTranscriptEnabledFlag.feature_enabled'
+ ) as video_transcript_feature:
+ video_transcript_feature.return_value = is_video_transcript_enabled
+ response = self.client.post(videos_handler_url, json.dumps(request_data), content_type='application/json')
+
+ self.assertEqual(response.status_code, 200) # noqa: PT009
+
+ # Ensure `transcript_preferences` was set up in metadata correctly if sent through request.
+ if is_video_transcript_enabled and transcript_preferences:
+ self.assertEqual(len(presigned_url_calls), 1) # noqa: PT009
+ metadata = presigned_url_calls[0][1]['Metadata']
+ self.assertIn('transcript_preferences', metadata) # noqa: PT009
+ self.assertEqual(metadata['transcript_preferences'], json.dumps(transcript_preferences)) # noqa: PT009
+ else:
+ # If conditions aren't met, verify transcript_preferences is not in metadata
+ if presigned_url_calls:
+ metadata = presigned_url_calls[0][1]['Metadata']
+ self.assertNotIn('transcript_preferences', metadata) # noqa: PT009
+
+
+@patch.dict("django.conf.settings.FEATURES", {"ENABLE_VIDEO_UPLOAD_PIPELINE": True})
+@override_settings(VIDEO_UPLOAD_PIPELINE={"BUCKET": "test_bucket", "ROOT_PATH": "test_root"})
+class VideoUrlsCsvTestCase(
+ VideoUploadTestBase,
+ VideoStudioAccessTestsMixin,
+ VideoPipelineStudioAccessTestsMixin,
+ CourseTestCase
+):
+ """Test cases for the CSV download endpoint for video uploads"""
+
+ VIEW_NAME = "video_encodings_download"
+
+ def setUp(self):
+ super().setUp()
+ VideoUploadConfig(profile_whitelist="profile1").save()
+
+ def _check_csv_response(self, expected_profiles):
+ """
+ Check that the response is a valid CSV response containing rows
+ corresponding to previous_uploads and including the expected profiles.
+ """
+ response = self.client.get(self.url)
+ self.assertEqual(response.status_code, 200) # noqa: PT009
+ self.assertEqual( # noqa: PT009
+ response["Content-Disposition"],
+ f"attachment; filename=\"{self.course.id.course}_video_urls.csv\""
+ )
+ response_content = b"".join(response.streaming_content)
+ response_reader = StringIO(response_content.decode())
+ reader = csv.DictReader(response_reader, dialect=csv.excel)
+ self.assertEqual( # noqa: PT009
+ reader.fieldnames,
+ (
+ ["Name", "Duration", "Date Added", "Video ID", "Status"] +
+ [f"{profile} URL" for profile in expected_profiles]
+ )
+ )
+ rows = list(reader)
+ self.assertEqual(len(rows), len(self.previous_uploads)) # noqa: PT009
+ for i, row in enumerate(rows):
+ response_video = dict(row.items())
+ # Videos should be returned by creation date descending
+ original_video = self.previous_uploads[-(i + 1)]
+ client_video_id = original_video["client_video_id"]
+ self.assertEqual(response_video["Name"], client_video_id) # noqa: PT009
+ self.assertEqual(response_video["Duration"], str(original_video["duration"])) # noqa: PT009
+ dateutil.parser.parse(response_video["Date Added"])
+ self.assertEqual(response_video["Video ID"], original_video["edx_video_id"]) # noqa: PT009
+ self.assertEqual(response_video["Status"], convert_video_status(original_video)) # noqa: PT009
+ for profile in expected_profiles:
+ response_profile_url = response_video[f"{profile} URL"]
+ original_encoded_for_profile = next(
+ (
+ original_encoded
+ for original_encoded in original_video["encoded_videos"]
+ if original_encoded["profile"] == profile
+ ),
+ None
+ )
+ if original_encoded_for_profile:
+ original_encoded_for_profile_url = original_encoded_for_profile["url"]
+ self.assertEqual(response_profile_url, original_encoded_for_profile_url) # noqa: PT009
+ else:
+ self.assertEqual(response_profile_url, "") # noqa: PT009
+
+ def test_basic(self):
+ self._check_csv_response(["profile1"])
+
+ def test_profile_whitelist(self):
+ VideoUploadConfig(profile_whitelist="profile1,profile2").save()
+ self._check_csv_response(["profile1", "profile2"])
+
+ def test_non_ascii_course(self):
+ course = CourseFactory.create(
+ number="nón-äscii",
+ video_upload_pipeline={
+ "course_video_upload_token": self.test_token,
+ }
+ )
+ response = self.client.get(self.get_url_for_course_key(course.id))
+ self.assertEqual(response.status_code, 200) # noqa: PT009
+ self.assertEqual( # noqa: PT009
+ response["Content-Disposition"],
+ "attachment; filename*=utf-8''n%C3%B3n-%C3%A4scii_video_urls.csv"
+ )
+
+
+@ddt.ddt
+class GetVideoFeaturesTestCase(
+ CourseTestCase
+):
+ """Test cases for the get_video_features endpoint """
+ def setUp(self):
+ super().setUp()
+ self.url = self.get_url_for_course_key()
+
+ def get_url_for_course_key(self):
+ """ Helper to generate a url for a course key """
+ return reverse("video_features")
+
+ def test_basic(self):
+ """ Test for expected return keys """
+ response = self.client.get(self.get_url_for_course_key())
+ self.assertEqual(response.status_code, 200) # noqa: PT009
+ self.assertEqual( # noqa: PT009
+ set(response.json().keys()),
+ {
+ 'videoSharingEnabled',
+ 'allowThumbnailUpload',
+ }
+ )
+
+ @ddt.data(True, False)
+ def test_video_share_enabled(self, is_enabled):
+ """ Test the public video share flag """
+ self._test_video_feature(
+ PUBLIC_VIDEO_SHARE,
+ 'videoSharingEnabled',
+ override_waffle_flag,
+ is_enabled,
+ )
+
+ @ddt.data(True, False)
+ def test_video_image_upload_enabled(self, is_enabled):
+ """ Test the video image upload switch """
+ self._test_video_feature(
+ VIDEO_IMAGE_UPLOAD_ENABLED,
+ 'allowThumbnailUpload',
+ override_waffle_switch,
+ is_enabled,
+ )
+
+ def _test_video_feature(self, flag, key, override_fn, is_enabled):
+ """ Test that setting a waffle flag or switch on or off will cause the expected result """
+ with override_fn(flag, is_enabled):
+ response = self.client.get(self.get_url_for_course_key())
+
+ self.assertEqual(response.status_code, 200) # noqa: PT009
+ self.assertEqual(response.json()[key], is_enabled) # noqa: PT009
+
+
+class GetStorageBucketTestCase(TestCase):
+ """ This test just check that connection works and returns the bucket.
+ It does not involve any mocking and triggers errors if has any import issue.
+ """
+ @override_settings(AWS_ACCESS_KEY_ID='test_key_id', AWS_SECRET_ACCESS_KEY='test_secret')
+ @override_settings(VIDEO_UPLOAD_PIPELINE={
+ "VEM_S3_BUCKET": "vem_test_bucket", "BUCKET": "test_bucket", "ROOT_PATH": "test_root"
+ })
+ @patch('cms.djangoapps.contentstore.video_storage_handlers.boto3.resource')
+ def test_storage_bucket(self, mock_boto3_resource):
+ """ Test that storage service functions work correctly with boto3."""
+ # Setup boto3 mocks
+ mock_s3_client, mock_bucket, mock_s3_resource = setup_s3_mocks(mock_boto3_resource, 'vem_test_bucket')
+
+ # Test storage_service_bucket function
+ bucket = storage_service_bucket()
+ self.assertEqual(bucket.name, 'vem_test_bucket') # noqa: PT009
+ mock_s3_resource.Bucket.assert_called_once_with('vem_test_bucket')
+
+ # Test storage_service_key function
+ edx_video_id = 'dummy_video'
+ key_name = storage_service_key(bucket, file_name=edx_video_id)
+ expected_key = 'test_root/dummy_video'
+ self.assertEqual(key_name, expected_key) # noqa: PT009
+
+ # Test that we can generate presigned URL using the bucket's client
+ mock_s3_client.generate_presigned_url.return_value = (
+ 'https://vem_test_bucket.s3.amazonaws.com:443/test_root/dummy_video?signature=test'
+ )
+ upload_url = mock_s3_client.generate_presigned_url(
+ 'put_object',
+ Params={
+ 'Bucket': bucket.name,
+ 'Key': key_name,
+ 'ContentType': 'video/mp4'
+ },
+ ExpiresIn=KEY_EXPIRATION_IN_SECONDS
+ )
+
+ self.assertIn("vem_test_bucket.s3.amazonaws.com", upload_url) # noqa: PT009
+ self.assertIn("test_root/dummy_video", upload_url) # noqa: PT009
+
+
+class CourseYoutubeEdxVideoIds(ModuleStoreTestCase):
+ """
+ This test checks youtube videos in a course
+ """
+ VIEW_NAME = 'youtube_edx_video_ids'
+
+ def setUp(self):
+ super().setUp()
+ self.course = CourseFactory.create()
+ self.course_with_no_youtube_videos = CourseFactory.create()
+ self.store = modulestore()
+ self.user = UserFactory()
+ self.client.login(username=self.user.username, password='Password1234')
+
+ def get_url_for_course_key(self, course_key, kwargs=None):
+ """Return video handler URL for the given course"""
+ return reverse_course_url(self.VIEW_NAME, course_key, kwargs) # lint-amnesty, pylint: disable=no-member
+
+ def test_course_with_youtube_videos(self):
+ course_key = self.course.id
+
+ with self.store.bulk_operations(course_key):
+ chapter_loc = self.store.create_child(
+ self.user.id, self.course.location, 'chapter', 'test_chapter'
+ ).location
+ seq_loc = self.store.create_child(
+ self.user.id, chapter_loc, 'sequential', 'test_seq'
+ ).location
+ vert_loc = self.store.create_child(self.user.id, seq_loc, 'vertical', 'test_vert').location
+ self.store.create_child(
+ self.user.id,
+ vert_loc,
+ 'problem',
+ 'test_problem',
+ fields={"data": "Test "}
+ )
+ self.store.create_child(
+ self.user.id, vert_loc, 'video', fields={
+ "youtube_is_available": False,
+ "name": "sample_video",
+ "edx_video_id": "youtube_193_84709099",
+ }
+ )
+
+ response = self.client.get(self.get_url_for_course_key(course_key))
+ self.assertEqual(response.status_code, 200) # noqa: PT009
+
+ edx_video_ids = json.loads(response.content.decode('utf-8'))['edx_video_ids']
+ self.assertEqual(len(edx_video_ids), 1) # noqa: PT009
+
+ def test_course_with_no_youtube_videos(self):
+ course_key = self.course_with_no_youtube_videos.id
+
+ with self.store.bulk_operations(course_key):
+ chapter_loc = self.store.create_child(
+ self.user.id, self.course_with_no_youtube_videos.location, 'chapter', 'test_chapter'
+ ).location
+ seq_loc = self.store.create_child(
+ self.user.id, chapter_loc, 'sequential', 'test_seq'
+ ).location
+ vert_loc = self.store.create_child(self.user.id, seq_loc, 'vertical', 'test_vert').location
+ self.store.create_child(
+ self.user.id, vert_loc, 'problem', 'test_problem', fields={"data": "Test "}
+ )
+ self.store.create_child(
+ self.user.id, vert_loc, 'video', fields={
+ "youtube_id_1_0": None,
+ "name": "sample_video",
+ "edx_video_id": "no_youtube_193_84709099",
+ }
+ )
+
+ response = self.client.get(self.get_url_for_course_key(course_key))
+
+ edx_video_ids = json.loads(response.content.decode('utf-8'))['edx_video_ids']
+ self.assertEqual(response.status_code, 200) # noqa: PT009
+ self.assertEqual(len(edx_video_ids), 0) # noqa: PT009
diff --git a/cms/djangoapps/contentstore/views/transcripts_ajax.py b/cms/djangoapps/contentstore/views/transcripts_ajax.py
index 231676df80a8..290bd06b180e 100644
--- a/cms/djangoapps/contentstore/views/transcripts_ajax.py
+++ b/cms/djangoapps/contentstore/views/transcripts_ajax.py
@@ -521,7 +521,7 @@ def _validate_transcripts_data(request):
try:
item = _get_item(request, data)
except (InvalidKeyError, ItemNotFoundError):
- raise TranscriptsRequestValidationException(_("Can't find item by locator.")) # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904
+ raise TranscriptsRequestValidationException(_("Can't find item by locator.")) # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904, E501
if item.usage_key.block_type != 'video':
raise TranscriptsRequestValidationException(_('Transcripts are supported only for "video" blocks.'))
diff --git a/cms/djangoapps/contentstore/xblock_storage_handlers/view_handlers.py b/cms/djangoapps/contentstore/xblock_storage_handlers/view_handlers.py
index e3120c1173de..d9e84e0d781d 100644
--- a/cms/djangoapps/contentstore/xblock_storage_handlers/view_handlers.py
+++ b/cms/djangoapps/contentstore/xblock_storage_handlers/view_handlers.py
@@ -1596,7 +1596,7 @@ def safe_get_username(user_id):
if user_id:
try:
return User.objects.get(id=user_id).username
- except: # pylint: disable=bare-except
+ except: # noqa: E722
pass
return None
diff --git a/cms/djangoapps/course_creators/admin.py b/cms/djangoapps/course_creators/admin.py
index c02bd99bbccf..b93bb9c07f08 100644
--- a/cms/djangoapps/course_creators/admin.py
+++ b/cms/djangoapps/course_creators/admin.py
@@ -158,7 +158,7 @@ def send_user_notification_callback(sender, **kwargs): # pylint: disable=unused
try:
user.email_user(subject, message, studio_request_email)
- except: # lint-amnesty, pylint: disable=bare-except
+ except: # noqa: E722
log.warning("Unable to send course creator status e-mail to %s", user.email)
diff --git a/cms/djangoapps/course_creators/tests/test_admin.py b/cms/djangoapps/course_creators/tests/test_admin.py
index 28b9a6a61862..10eea935320d 100644
--- a/cms/djangoapps/course_creators/tests/test_admin.py
+++ b/cms/djangoapps/course_creators/tests/test_admin.py
@@ -123,7 +123,7 @@ def check_admin_message_state(state, expect_sent_to_admin, expect_sent_to_user):
if expect_sent_to_admin:
context = {'user_name': 'test_user', 'user_email': 'test_user+courses@edx.org'}
- self.assertEqual(base_num_emails + 1, len(mail.outbox), 'Expected admin message to be sent') # noqa: PT009 # pylint: disable=line-too-long
+ self.assertEqual(base_num_emails + 1, len(mail.outbox), 'Expected admin message to be sent') # noqa: PT009
sent_mail = mail.outbox[base_num_emails]
self.assertEqual( # noqa: PT009
mock_render_to_string('emails/course_creator_admin_subject.txt', context),
diff --git a/cms/djangoapps/export_course_metadata/toggles.py b/cms/djangoapps/export_course_metadata/toggles.py
index 9eca63c6ef19..e0148091f63c 100644
--- a/cms/djangoapps/export_course_metadata/toggles.py
+++ b/cms/djangoapps/export_course_metadata/toggles.py
@@ -12,4 +12,4 @@
# .. toggle_creation_date: 2021-03-01
# .. toggle_target_removal_date: None
# .. toggle_tickets: AA-461
-EXPORT_COURSE_METADATA_FLAG = WaffleFlag('cms.export_course_metadata', __name__) # lint-amnesty, pylint: disable=toggle-missing-annotation
+EXPORT_COURSE_METADATA_FLAG = WaffleFlag('cms.export_course_metadata', __name__) # pylint: disable=toggle-missing-annotation
diff --git a/cms/djangoapps/models/settings/course_grading.py b/cms/djangoapps/models/settings/course_grading.py
index e6a0e3690c5c..da5a49677054 100644
--- a/cms/djangoapps/models/settings/course_grading.py
+++ b/cms/djangoapps/models/settings/course_grading.py
@@ -275,7 +275,7 @@ def get_section_grader_type(location):
}
@staticmethod
- def update_section_grader_type(block, grader_type, user): # lint-amnesty, pylint: disable=missing-function-docstring
+ def update_section_grader_type(block, grader_type, user): # pylint: disable=missing-function-docstring
if grader_type is not None and grader_type != 'notgraded':
block.format = grader_type
block.graded = True
diff --git a/cms/djangoapps/models/settings/course_metadata.py b/cms/djangoapps/models/settings/course_metadata.py
index 402bf834da63..86a49d20bfc2 100644
--- a/cms/djangoapps/models/settings/course_metadata.py
+++ b/cms/djangoapps/models/settings/course_metadata.py
@@ -232,7 +232,7 @@ def update_from_json(cls, block, jsondict, user, filter_tabs=True):
else:
key_values[key] = block.fields[key].from_json(val)
except (TypeError, ValueError) as err:
- raise ValueError(_("Incorrect format for field '{name}'. {detailed_message}").format( # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904
+ raise ValueError(_("Incorrect format for field '{name}'. {detailed_message}").format( # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904, E501
name=model['display_name'], detailed_message=str(err)))
return cls.update_from_dict(key_values, block, user)
diff --git a/cms/djangoapps/modulestore_migrator/tests/test_tasks.py b/cms/djangoapps/modulestore_migrator/tests/test_tasks.py
index ae4ad1548937..449ed96c943e 100644
--- a/cms/djangoapps/modulestore_migrator/tests/test_tasks.py
+++ b/cms/djangoapps/modulestore_migrator/tests/test_tasks.py
@@ -311,7 +311,7 @@ def test_bulk_migrate_invalid_sources(self):
status = UserTaskStatus.objects.get(task_id=task.id)
self.assertEqual(status.state, UserTaskStatus.FAILED) # noqa: PT009
- self.assertEqual(self._get_task_status_fail_message(status), "ModulestoreSource matching query does not exist.") # noqa: PT009 # pylint: disable=line-too-long
+ self.assertEqual(self._get_task_status_fail_message(status), "ModulestoreSource matching query does not exist.") # noqa: PT009
def test_bulk_migrate_invalid_collection(self):
"""
@@ -336,7 +336,7 @@ def test_bulk_migrate_invalid_collection(self):
status = UserTaskStatus.objects.get(task_id=task.id)
self.assertEqual(status.state, UserTaskStatus.FAILED) # noqa: PT009
- self.assertEqual(self._get_task_status_fail_message(status), "Collection matching query does not exist.") # noqa: PT009 # pylint: disable=line-too-long
+ self.assertEqual(self._get_task_status_fail_message(status), "Collection matching query does not exist.") # noqa: PT009
def test_bulk_migration_task_calculate_total_steps(self):
"""
@@ -803,7 +803,7 @@ def test_migrate_container_different_container_types(self):
container_version = result.containerversion
self.assertEqual(container_version.title, f"Test {block_type.title()}") # noqa: PT009
# The container is published
- self.assertFalse(content_api.contains_unpublished_changes(container_version.container.pk)) # noqa: PT009 # pylint: disable=line-too-long
+ self.assertFalse(content_api.contains_unpublished_changes(container_version.container.pk)) # noqa: PT009
def test_migrate_container_same_title(self):
"""
diff --git a/cms/envs/common.py b/cms/envs/common.py
index 3c9ada1bb4e3..9bffd9e64064 100644
--- a/cms/envs/common.py
+++ b/cms/envs/common.py
@@ -1224,9 +1224,7 @@ def make_lms_template_path(settings):
DISCUSSIONS_INCONTEXT_FEEDBACK_URL = ''
# Learn More link in upgraded discussion notification alert
-# pylint: disable=line-too-long
DISCUSSIONS_INCONTEXT_LEARNMORE_URL = "https://docs.openedx.org/en/latest/educators/concepts/communication/about_course_discussions.html"
-# pylint: enable=line-too-long
#### Event bus producing ####
diff --git a/cms/envs/devstack.py b/cms/envs/devstack.py
index 6dd89f5e36ec..67fd82eac713 100644
--- a/cms/envs/devstack.py
+++ b/cms/envs/devstack.py
@@ -1,4 +1,4 @@
-# ruff: noqa: I001 - settings file: star-import order is semantically significant
+
"""
Specific overrides to the base prod settings to make development easier.
"""
@@ -277,7 +277,7 @@ def should_show_debug_toolbar(request): # lint-amnesty, pylint: disable=missing
SOCIAL_AUTH_EDX_OAUTH2_KEY = 'studio-sso-key'
SOCIAL_AUTH_EDX_OAUTH2_SECRET = 'studio-sso-secret' # in stage, prod would be high-entropy secret
# routed internally server-to-server
-SOCIAL_AUTH_EDX_OAUTH2_URL_ROOT = ENV_TOKENS.get('SOCIAL_AUTH_EDX_OAUTH2_URL_ROOT', 'http://edx.devstack.lms:18000') # noqa: F405 # pylint: disable=line-too-long
+SOCIAL_AUTH_EDX_OAUTH2_URL_ROOT = ENV_TOKENS.get('SOCIAL_AUTH_EDX_OAUTH2_URL_ROOT', 'http://edx.devstack.lms:18000') # noqa: F405
SOCIAL_AUTH_EDX_OAUTH2_PUBLIC_URL_ROOT = 'http://localhost:18000' # used in browser redirect
# Don't form the return redirect URL with HTTPS on devstack
@@ -317,14 +317,14 @@ def should_show_debug_toolbar(request): # lint-amnesty, pylint: disable=missing
EVENT_BUS_TOPIC_PREFIX = 'dev'
EVENT_BUS_CONSUMER = 'edx_event_bus_redis.RedisEventConsumer'
-course_catalog_event_setting = EVENT_BUS_PRODUCER_CONFIG['org.openedx.content_authoring.course.catalog_info.changed.v1'] # noqa: F405 # pylint: disable=line-too-long
+course_catalog_event_setting = EVENT_BUS_PRODUCER_CONFIG['org.openedx.content_authoring.course.catalog_info.changed.v1'] # noqa: F405
course_catalog_event_setting['course-catalog-info-changed']['enabled'] = True
-xblock_published_event_setting = EVENT_BUS_PRODUCER_CONFIG['org.openedx.content_authoring.xblock.published.v1'] # noqa: F405 # pylint: disable=line-too-long
+xblock_published_event_setting = EVENT_BUS_PRODUCER_CONFIG['org.openedx.content_authoring.xblock.published.v1'] # noqa: F405
xblock_published_event_setting['course-authoring-xblock-lifecycle']['enabled'] = True
-xblock_deleted_event_setting = EVENT_BUS_PRODUCER_CONFIG['org.openedx.content_authoring.xblock.deleted.v1'] # noqa: F405 # pylint: disable=line-too-long
+xblock_deleted_event_setting = EVENT_BUS_PRODUCER_CONFIG['org.openedx.content_authoring.xblock.deleted.v1'] # noqa: F405
xblock_deleted_event_setting['course-authoring-xblock-lifecycle']['enabled'] = True
-xblock_duplicated_event_setting = EVENT_BUS_PRODUCER_CONFIG['org.openedx.content_authoring.xblock.duplicated.v1'] # noqa: F405 # pylint: disable=line-too-long
+xblock_duplicated_event_setting = EVENT_BUS_PRODUCER_CONFIG['org.openedx.content_authoring.xblock.duplicated.v1'] # noqa: F405
xblock_duplicated_event_setting['course-authoring-xblock-lifecycle']['enabled'] = True
diff --git a/cms/envs/docker-production.py b/cms/envs/docker-production.py
index 4096ca6b11f6..2590329c19cc 100644
--- a/cms/envs/docker-production.py
+++ b/cms/envs/docker-production.py
@@ -1,4 +1,4 @@
-# ruff: noqa: I001 - settings file: star-import order is semantically significant
+
"""
Specific overrides to the base prod settings for a docker production deployment.
"""
diff --git a/cms/envs/test.py b/cms/envs/test.py
index b4d32a8aecc5..e499252a10b1 100644
--- a/cms/envs/test.py
+++ b/cms/envs/test.py
@@ -211,7 +211,7 @@
############## openedx_content config ##############
OPENEDX_LEARNING = {
- "MEDIA": {"BACKEND": "django.core.files.storage.InMemoryStorage", "OPTIONS": {"location": MEDIA_ROOT + "_private"}} # noqa: F405 # pylint: disable=line-too-long
+ "MEDIA": {"BACKEND": "django.core.files.storage.InMemoryStorage", "OPTIONS": {"location": MEDIA_ROOT + "_private"}} # noqa: F405
}
diff --git a/cms/lib/xblock/tagging/tagging.py b/cms/lib/xblock/tagging/tagging.py
index a8796c4c5b05..e69afaf689a7 100644
--- a/cms/lib/xblock/tagging/tagging.py
+++ b/cms/lib/xblock/tagging/tagging.py
@@ -95,7 +95,7 @@ def save_tags(self, request=None, suffix=None): # lint-amnesty, pylint: disable
for posted_tag_value in posted_data[av_tag.name]:
if posted_tag_value not in tag_available_values and posted_tag_value not in tag_current_values:
- return Response("Invalid tag value was passed: %s" % posted_tag_value, status=400) # noqa: UP031 # pylint: disable=line-too-long
+ return Response("Invalid tag value was passed: %s" % posted_tag_value, status=400) # noqa: UP031
saved_tags[av_tag.name] = posted_data[av_tag.name]
need_update = True
diff --git a/cms/lib/xblock/tagging/test.py b/cms/lib/xblock/tagging/test.py
index 1ba55a774b9b..4b65899ab943 100644
--- a/cms/lib/xblock/tagging/test.py
+++ b/cms/lib/xblock/tagging/test.py
@@ -131,7 +131,7 @@ def test_aside_contains_tags(self):
runtime = TestRuntime(services={'field-data': field_data})
xblock_aside = StructuredTagsAside(scope_ids=sids, runtime=runtime)
available_tags = xblock_aside.get_available_tags()
- self.assertEqual(len(available_tags), 2, "StructuredTagsAside should contains two tag categories") # noqa: PT009 # pylint: disable=line-too-long
+ self.assertEqual(len(available_tags), 2, "StructuredTagsAside should contains two tag categories") # noqa: PT009
def test_preview_html(self):
"""
@@ -184,7 +184,7 @@ def test_preview_html(self):
self.assertEqual(len(option_nodes2), 3) # noqa: PT009
option_values2 = [opt_elem.text for opt_elem in option_nodes2 if opt_elem.text]
- self.assertEqual(option_values2, ['Learned a few things', 'Learned everything', 'Learned nothing']) # noqa: PT009 # pylint: disable=line-too-long
+ self.assertEqual(option_values2, ['Learned a few things', 'Learned everything', 'Learned nothing']) # noqa: PT009
# Now ensure the acid_aside is not in the result
self.assertNotRegex(problem_html, r"data-block-type=[\"\']acid_aside[\"\']") # noqa: PT009
diff --git a/cms/lib/xblock/test/test_authoring_mixin.py b/cms/lib/xblock/test/test_authoring_mixin.py
index 428adf2dcd4d..4a6055432d41 100644
--- a/cms/lib/xblock/test/test_authoring_mixin.py
+++ b/cms/lib/xblock/test/test_authoring_mixin.py
@@ -26,8 +26,8 @@ class AuthoringMixinTestCase(ModuleStoreTestCase):
MODULESTORE = TEST_DATA_SPLIT_MODULESTORE
GROUP_NO_LONGER_EXISTS = "This group no longer exists"
NO_CONTENT_OR_ENROLLMENT_GROUPS = "Access to this component is not restricted"
- NO_CONTENT_ENROLLMENT_TRACK_ENABLED = "You can restrict access to this component to learners in specific enrollment tracks or content groups" # lint-amnesty, pylint: disable=line-too-long
- NO_CONTENT_ENROLLMENT_TRACK_DISABLED = "You can restrict access to this component to learners in specific content groups" # lint-amnesty, pylint: disable=line-too-long
+ NO_CONTENT_ENROLLMENT_TRACK_ENABLED = "You can restrict access to this component to learners in specific enrollment tracks or content groups" # noqa: E501
+ NO_CONTENT_ENROLLMENT_TRACK_DISABLED = "You can restrict access to this component to learners in specific content groups" # noqa: E501
CONTENT_GROUPS_TITLE = "Content Groups"
ENROLLMENT_GROUPS_TITLE = "Enrollment Track Groups"
STAFF_LOCKED = 'The unit that contains this component is hidden from learners'
diff --git a/cms/urls.py b/cms/urls.py
index 90b295f92804..1a46ce15f916 100644
--- a/cms/urls.py
+++ b/cms/urls.py
@@ -344,7 +344,7 @@
# pylint: disable=wrong-import-position, wrong-import-order
from edx_django_utils.plugins import get_plugin_url_patterns # noqa: I001 - must be after urlpatterns are built
# pylint: disable=wrong-import-position
-from openedx.core.djangoapps.plugins.constants import ProjectType # noqa: I001 - must be after urlpatterns are built
+from openedx.core.djangoapps.plugins.constants import ProjectType
urlpatterns.extend(get_plugin_url_patterns(ProjectType.CMS))
diff --git a/cms/wsgi.py b/cms/wsgi.py
index 10a8292b7e47..7f545b28a1e8 100644
--- a/cms/wsgi.py
+++ b/cms/wsgi.py
@@ -20,5 +20,5 @@
# This application object is used by the development server
# as well as any WSGI server configured to use this file.
-from django.core.wsgi import get_wsgi_application # lint-amnesty, pylint: disable=wrong-import-order, wrong-import-position
+from django.core.wsgi import get_wsgi_application # pylint: disable=wrong-import-order, wrong-import-position
application = get_wsgi_application()
diff --git a/common/djangoapps/course_action_state/managers.py b/common/djangoapps/course_action_state/managers.py
index 58ce34db1fbd..5a172aa476ac 100644
--- a/common/djangoapps/course_action_state/managers.py
+++ b/common/djangoapps/course_action_state/managers.py
@@ -74,7 +74,7 @@ def update_state(
state_object.created_user = user
else:
raise CourseActionStateItemNotFoundError(
- "Cannot update non-existent entry for course_key {course_key} and action {action}".format( # noqa: UP032 # pylint: disable=line-too-long
+ "Cannot update non-existent entry for course_key {course_key} and action {action}".format( # noqa: UP032
action=self.ACTION,
course_key=course_key,
))
diff --git a/common/djangoapps/course_action_state/tests/test_rerun_manager.py b/common/djangoapps/course_action_state/tests/test_rerun_manager.py
index ad00aa755eb8..d2183cae7a1f 100644
--- a/common/djangoapps/course_action_state/tests/test_rerun_manager.py
+++ b/common/djangoapps/course_action_state/tests/test_rerun_manager.py
@@ -96,7 +96,7 @@ def test_rerun_failed(self):
exception = Exception("failure in rerunning")
try:
raise exception
- except: # lint-amnesty, pylint: disable=bare-except
+ except: # noqa: E722
CourseRerunState.objects.failed(course_key=self.course_key)
self.expected_rerun_state.update(
diff --git a/common/djangoapps/course_modes/models.py b/common/djangoapps/course_modes/models.py
index d07200735115..a2c4e0c5dbb6 100644
--- a/common/djangoapps/course_modes/models.py
+++ b/common/djangoapps/course_modes/models.py
@@ -255,13 +255,13 @@ def clean(self):
mode_display_name = mode_config.get('display_name', self.mode_slug)
raise ValidationError(
_( # lint-amnesty, pylint: disable=translation-of-non-string
- "The {course_mode} course mode has a minimum price of {min_price}. You must set a price greater than or equal to {min_price}.".format( # lint-amnesty, pylint: disable=line-too-long
+ "The {course_mode} course mode has a minimum price of {min_price}. You must set a price greater than or equal to {min_price}.".format( # noqa: E501
course_mode=mode_display_name, min_price=min_price_for_mode
)
)
)
- def save(self, force_insert=False, force_update=False, using=None): # lint-amnesty, pylint: disable=arguments-differ # noqa: DJ012
+ def save(self, force_insert=False, force_update=False, using=None): # lint-amnesty, pylint: disable=arguments-differ # noqa: DJ012, E501
# Ensure currency is always lowercase.
self.clean() # ensure object-level validation is performed before we save.
self.currency = self.currency.lower()
diff --git a/common/djangoapps/course_modes/tests/test_models.py b/common/djangoapps/course_modes/tests/test_models.py
index 46d01c4b3638..f9fd42c4d98a 100644
--- a/common/djangoapps/course_modes/tests/test_models.py
+++ b/common/djangoapps/course_modes/tests/test_models.py
@@ -347,7 +347,7 @@ def test_invalid_mode_expiration(self, mode_slug, exp_dt_name):
assert not is_error_expected, 'Expected a ValidationError to be thrown.'
except ValidationError as exc:
assert is_error_expected, 'Did not expect a ValidationError to be thrown.'
- assert exc.messages == ['Professional education modes are not allowed to have expiration_datetime set.'] # noqa: PT017 # pylint: disable=line-too-long
+ assert exc.messages == ['Professional education modes are not allowed to have expiration_datetime set.'] # noqa: PT017
@ddt.data(
"verified",
diff --git a/common/djangoapps/entitlements/admin.py b/common/djangoapps/entitlements/admin.py
index 789490c7f42f..36c0948f7be5 100644
--- a/common/djangoapps/entitlements/admin.py
+++ b/common/djangoapps/entitlements/admin.py
@@ -36,7 +36,7 @@ def __init__(self, *args, **kwargs):
try:
self.data['unenrolled_run'] = CourseKey.from_string(self.data['unenrolled_run'])
except InvalidKeyError:
- raise forms.ValidationError("No valid CourseKey for id {}!".format(self.data['unenrolled_run'])) # lint-amnesty, pylint: disable=raise-missing-from,line-too-long # noqa: B904
+ raise forms.ValidationError("No valid CourseKey for id {}!".format(self.data['unenrolled_run'])) # pylint: disable=raise-missing-from # noqa: B904
def clean_course_id(self):
"""Cleans course id and attempts to make course key from string version of key"""
@@ -44,7 +44,7 @@ def clean_course_id(self):
try:
course_key = CourseKey.from_string(course_id)
except InvalidKeyError:
- raise forms.ValidationError(f"Cannot make a valid CourseKey from id {course_id}!") # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904
+ raise forms.ValidationError(f"Cannot make a valid CourseKey from id {course_id}!") # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904, E501
if not modulestore().has_course(course_key):
raise forms.ValidationError(f"Cannot find course with id {course_id} in the modulestore")
diff --git a/common/djangoapps/entitlements/migrations/0001_initial.py b/common/djangoapps/entitlements/migrations/0001_initial.py
index 5b27fc4cbc9d..6f820cc33a9b 100644
--- a/common/djangoapps/entitlements/migrations/0001_initial.py
+++ b/common/djangoapps/entitlements/migrations/0001_initial.py
@@ -18,14 +18,14 @@ class Migration(migrations.Migration): # lint-amnesty, pylint: disable=missing-
name='CourseEntitlement',
fields=[
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
- ('created', model_utils.fields.AutoCreatedField(default=django.utils.timezone.now, verbose_name='created', editable=False)), # lint-amnesty, pylint: disable=line-too-long
- ('modified', model_utils.fields.AutoLastModifiedField(default=django.utils.timezone.now, verbose_name='modified', editable=False)), # lint-amnesty, pylint: disable=line-too-long
+ ('created', model_utils.fields.AutoCreatedField(default=django.utils.timezone.now, verbose_name='created', editable=False)),
+ ('modified', model_utils.fields.AutoLastModifiedField(default=django.utils.timezone.now, verbose_name='modified', editable=False)),
('uuid', models.UUIDField(default=uuid.uuid4, editable=False)),
('course_uuid', models.UUIDField()),
('expired_at', models.DateTimeField(null=True)),
('mode', models.CharField(default='audit', max_length=100)),
('order_number', models.CharField(max_length=128, null=True)),
- ('enrollment_course_run', models.ForeignKey(to='student.CourseEnrollment', null=True, on_delete=models.CASCADE)), # lint-amnesty, pylint: disable=line-too-long
+ ('enrollment_course_run', models.ForeignKey(to='student.CourseEnrollment', null=True, on_delete=models.CASCADE)),
('user', models.ForeignKey(to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE)),
],
options={
diff --git a/common/djangoapps/entitlements/migrations/0002_auto_20171102_0719.py b/common/djangoapps/entitlements/migrations/0002_auto_20171102_0719.py
index 7cb69d3456db..5321ab7c8414 100644
--- a/common/djangoapps/entitlements/migrations/0002_auto_20171102_0719.py
+++ b/common/djangoapps/entitlements/migrations/0002_auto_20171102_0719.py
@@ -19,12 +19,12 @@ class Migration(migrations.Migration):
migrations.AlterField(
model_name='courseentitlement',
name='enrollment_course_run',
- field=models.ForeignKey(to='student.CourseEnrollment', help_text='The current Course enrollment for this entitlement. If NULL the Learner has not enrolled.', null=True, on_delete=models.CASCADE), # lint-amnesty, pylint: disable=line-too-long
+ field=models.ForeignKey(to='student.CourseEnrollment', help_text='The current Course enrollment for this entitlement. If NULL the Learner has not enrolled.', null=True, on_delete=models.CASCADE),
),
migrations.AlterField(
model_name='courseentitlement',
name='expired_at',
- field=models.DateTimeField(help_text='The date that an entitlement expired, if NULL the entitlement has not expired.', null=True), # lint-amnesty, pylint: disable=line-too-long
+ field=models.DateTimeField(help_text='The date that an entitlement expired, if NULL the entitlement has not expired.', null=True),
),
migrations.AlterField(
model_name='courseentitlement',
diff --git a/common/djangoapps/entitlements/migrations/0003_auto_20171205_1431.py b/common/djangoapps/entitlements/migrations/0003_auto_20171205_1431.py
index 59e5cc2db7c5..89ac51812266 100644
--- a/common/djangoapps/entitlements/migrations/0003_auto_20171205_1431.py
+++ b/common/djangoapps/entitlements/migrations/0003_auto_20171205_1431.py
@@ -15,25 +15,25 @@ class Migration(migrations.Migration): # lint-amnesty, pylint: disable=missing-
name='CourseEntitlementPolicy',
fields=[
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
- ('expiration_period', models.DurationField(default=datetime.timedelta(450), help_text='Duration in days from when an entitlement is created until when it is expired.')), # lint-amnesty, pylint: disable=line-too-long
- ('refund_period', models.DurationField(default=datetime.timedelta(60), help_text='Duration in days from when an entitlement is created until when it is no longer refundable')), # lint-amnesty, pylint: disable=line-too-long
- ('regain_period', models.DurationField(default=datetime.timedelta(14), help_text='Duration in days from when an entitlement is redeemed for a course run until it is no longer able to be regained by a user.')), # lint-amnesty, pylint: disable=line-too-long
+ ('expiration_period', models.DurationField(default=datetime.timedelta(450), help_text='Duration in days from when an entitlement is created until when it is expired.')),
+ ('refund_period', models.DurationField(default=datetime.timedelta(60), help_text='Duration in days from when an entitlement is created until when it is no longer refundable')),
+ ('regain_period', models.DurationField(default=datetime.timedelta(14), help_text='Duration in days from when an entitlement is redeemed for a course run until it is no longer able to be regained by a user.')),
('site', models.ForeignKey(to='sites.Site', on_delete=models.CASCADE)),
],
),
migrations.AlterField(
model_name='courseentitlement',
name='enrollment_course_run',
- field=models.ForeignKey(blank=True, to='student.CourseEnrollment', help_text='The current Course enrollment for this entitlement. If NULL the Learner has not enrolled.', null=True, on_delete=models.CASCADE), # lint-amnesty, pylint: disable=line-too-long
+ field=models.ForeignKey(blank=True, to='student.CourseEnrollment', help_text='The current Course enrollment for this entitlement. If NULL the Learner has not enrolled.', null=True, on_delete=models.CASCADE),
),
migrations.AlterField(
model_name='courseentitlement',
name='expired_at',
- field=models.DateTimeField(help_text='The date that an entitlement expired, if NULL the entitlement has not expired.', null=True, blank=True), # lint-amnesty, pylint: disable=line-too-long
+ field=models.DateTimeField(help_text='The date that an entitlement expired, if NULL the entitlement has not expired.', null=True, blank=True),
),
migrations.AddField(
model_name='courseentitlement',
name='_policy',
- field=models.ForeignKey(blank=True, to='entitlements.CourseEntitlementPolicy', null=True, on_delete=models.CASCADE), # lint-amnesty, pylint: disable=line-too-long
+ field=models.ForeignKey(blank=True, to='entitlements.CourseEntitlementPolicy', null=True, on_delete=models.CASCADE),
),
]
diff --git a/common/djangoapps/entitlements/migrations/0005_courseentitlementsupportdetail.py b/common/djangoapps/entitlements/migrations/0005_courseentitlementsupportdetail.py
index 1d64eba2829d..e630a14faccf 100644
--- a/common/djangoapps/entitlements/migrations/0005_courseentitlementsupportdetail.py
+++ b/common/djangoapps/entitlements/migrations/0005_courseentitlementsupportdetail.py
@@ -17,13 +17,13 @@ class Migration(migrations.Migration): # lint-amnesty, pylint: disable=missing-
name='CourseEntitlementSupportDetail',
fields=[
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
- ('created', model_utils.fields.AutoCreatedField(default=django.utils.timezone.now, verbose_name='created', editable=False)), # lint-amnesty, pylint: disable=line-too-long
- ('modified', model_utils.fields.AutoLastModifiedField(default=django.utils.timezone.now, verbose_name='modified', editable=False)), # lint-amnesty, pylint: disable=line-too-long
- ('reason', models.CharField(max_length=15, choices=[('LEAVE', 'Learner requested leave session for expired entitlement'), ('CHANGE', 'Learner requested session change for expired entitlement'), ('LEARNER_NEW', 'Learner requested new entitlement'), ('COURSE_TEAM_NEW', 'Course team requested entitlement for learnerg'), ('OTHER', 'Other')])), # lint-amnesty, pylint: disable=line-too-long
+ ('created', model_utils.fields.AutoCreatedField(default=django.utils.timezone.now, verbose_name='created', editable=False)),
+ ('modified', model_utils.fields.AutoLastModifiedField(default=django.utils.timezone.now, verbose_name='modified', editable=False)),
+ ('reason', models.CharField(max_length=15, choices=[('LEAVE', 'Learner requested leave session for expired entitlement'), ('CHANGE', 'Learner requested session change for expired entitlement'), ('LEARNER_NEW', 'Learner requested new entitlement'), ('COURSE_TEAM_NEW', 'Course team requested entitlement for learnerg'), ('OTHER', 'Other')])),
('comments', models.TextField(null=True)),
('entitlement', models.ForeignKey(to='entitlements.CourseEntitlement', on_delete=models.CASCADE)),
('support_user', models.ForeignKey(to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE)),
- ('unenrolled_run', models.ForeignKey(db_constraint=False, blank=True, to='course_overviews.CourseOverview', null=True, on_delete=models.CASCADE)), # lint-amnesty, pylint: disable=line-too-long
+ ('unenrolled_run', models.ForeignKey(db_constraint=False, blank=True, to='course_overviews.CourseOverview', null=True, on_delete=models.CASCADE)),
],
options={
'abstract': False,
diff --git a/common/djangoapps/entitlements/migrations/0006_courseentitlementsupportdetail_action.py b/common/djangoapps/entitlements/migrations/0006_courseentitlementsupportdetail_action.py
index 397dd3bc0dc2..f6b47c9eefdd 100644
--- a/common/djangoapps/entitlements/migrations/0006_courseentitlementsupportdetail_action.py
+++ b/common/djangoapps/entitlements/migrations/0006_courseentitlementsupportdetail_action.py
@@ -11,7 +11,7 @@ class Migration(migrations.Migration): # lint-amnesty, pylint: disable=missing-
migrations.AddField(
model_name='courseentitlementsupportdetail',
name='action',
- field=models.CharField(default='CREATE', max_length=15, choices=[('REISSUE', 'Re-issue entitlement'), ('CREATE', 'Create new entitlement')]), # lint-amnesty, pylint: disable=line-too-long
+ field=models.CharField(default='CREATE', max_length=15, choices=[('REISSUE', 'Re-issue entitlement'), ('CREATE', 'Create new entitlement')]),
preserve_default=False,
),
]
diff --git a/common/djangoapps/entitlements/migrations/0007_change_expiration_period_default.py b/common/djangoapps/entitlements/migrations/0007_change_expiration_period_default.py
index 50509209124a..a6e869089079 100644
--- a/common/djangoapps/entitlements/migrations/0007_change_expiration_period_default.py
+++ b/common/djangoapps/entitlements/migrations/0007_change_expiration_period_default.py
@@ -13,6 +13,6 @@ class Migration(migrations.Migration): # lint-amnesty, pylint: disable=missing-
migrations.AlterField(
model_name='courseentitlementpolicy',
name='expiration_period',
- field=models.DurationField(default=datetime.timedelta(730), help_text='Duration in days from when an entitlement is created until when it is expired.'), # lint-amnesty, pylint: disable=line-too-long
+ field=models.DurationField(default=datetime.timedelta(730), help_text='Duration in days from when an entitlement is created until when it is expired.'),
),
]
diff --git a/common/djangoapps/entitlements/migrations/0008_auto_20180328_1107.py b/common/djangoapps/entitlements/migrations/0008_auto_20180328_1107.py
index edaa38d98613..7389a3a75a2a 100644
--- a/common/djangoapps/entitlements/migrations/0008_auto_20180328_1107.py
+++ b/common/djangoapps/entitlements/migrations/0008_auto_20180328_1107.py
@@ -11,7 +11,7 @@ class Migration(migrations.Migration): # lint-amnesty, pylint: disable=missing-
migrations.AddField(
model_name='courseentitlementpolicy',
name='mode',
- field=models.CharField(max_length=32, null=True, choices=[(None, '---------'), ('verified', 'verified'), ('professional', 'professional')]), # lint-amnesty, pylint: disable=line-too-long
+ field=models.CharField(max_length=32, null=True, choices=[(None, '---------'), ('verified', 'verified'), ('professional', 'professional')]),
),
migrations.AlterField(
model_name='courseentitlementpolicy',
diff --git a/common/djangoapps/entitlements/migrations/0011_historicalcourseentitlement.py b/common/djangoapps/entitlements/migrations/0011_historicalcourseentitlement.py
index 8fcaf7b5a821..da715b512748 100644
--- a/common/djangoapps/entitlements/migrations/0011_historicalcourseentitlement.py
+++ b/common/djangoapps/entitlements/migrations/0011_historicalcourseentitlement.py
@@ -24,22 +24,22 @@ class Migration(migrations.Migration): # lint-amnesty, pylint: disable=missing-
name='HistoricalCourseEntitlement',
fields=[
('id', models.IntegerField(auto_created=True, blank=True, db_index=True, verbose_name='ID')),
- ('created', model_utils.fields.AutoCreatedField(default=django.utils.timezone.now, editable=False, verbose_name='created')), # lint-amnesty, pylint: disable=line-too-long
- ('modified', model_utils.fields.AutoLastModifiedField(default=django.utils.timezone.now, editable=False, verbose_name='modified')), # lint-amnesty, pylint: disable=line-too-long
+ ('created', model_utils.fields.AutoCreatedField(default=django.utils.timezone.now, editable=False, verbose_name='created')),
+ ('modified', model_utils.fields.AutoLastModifiedField(default=django.utils.timezone.now, editable=False, verbose_name='modified')),
('uuid', models.UUIDField(db_index=True, default=uuid.uuid4, editable=False)),
('course_uuid', models.UUIDField(help_text='UUID for the Course, not the Course Run')),
- ('expired_at', models.DateTimeField(blank=True, help_text='The date that an entitlement expired, if NULL the entitlement has not expired.', null=True)), # lint-amnesty, pylint: disable=line-too-long
- ('mode', models.CharField(help_text='The mode of the Course that will be applied on enroll.', max_length=100)), # lint-amnesty, pylint: disable=line-too-long
+ ('expired_at', models.DateTimeField(blank=True, help_text='The date that an entitlement expired, if NULL the entitlement has not expired.', null=True)),
+ ('mode', models.CharField(help_text='The mode of the Course that will be applied on enroll.', max_length=100)),
('order_number', models.CharField(max_length=128, null=True)),
('refund_locked', models.BooleanField(default=False)),
('history_id', models.AutoField(primary_key=True, serialize=False)),
('history_date', models.DateTimeField()),
('history_change_reason', models.CharField(max_length=100, null=True)),
- ('history_type', models.CharField(choices=[('+', 'Created'), ('~', 'Changed'), ('-', 'Deleted')], max_length=1)), # lint-amnesty, pylint: disable=line-too-long
- ('_policy', models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='entitlements.CourseEntitlementPolicy')), # lint-amnesty, pylint: disable=line-too-long
- ('enrollment_course_run', models.ForeignKey(blank=True, db_constraint=False, help_text='The current Course enrollment for this entitlement. If NULL the Learner has not enrolled.', null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='student.CourseEnrollment')), # lint-amnesty, pylint: disable=line-too-long
- ('history_user', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to=settings.AUTH_USER_MODEL)), # lint-amnesty, pylint: disable=line-too-long
- ('user', models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to=settings.AUTH_USER_MODEL)), # lint-amnesty, pylint: disable=line-too-long
+ ('history_type', models.CharField(choices=[('+', 'Created'), ('~', 'Changed'), ('-', 'Deleted')], max_length=1)),
+ ('_policy', models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='entitlements.CourseEntitlementPolicy')),
+ ('enrollment_course_run', models.ForeignKey(blank=True, db_constraint=False, help_text='The current Course enrollment for this entitlement. If NULL the Learner has not enrolled.', null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='student.CourseEnrollment')),
+ ('history_user', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to=settings.AUTH_USER_MODEL)),
+ ('user', models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to=settings.AUTH_USER_MODEL)),
],
options={
'ordering': ('-history_date', '-history_id'),
diff --git a/common/djangoapps/entitlements/migrations/0013_historicalcourseentitlementsupportdetail.py b/common/djangoapps/entitlements/migrations/0013_historicalcourseentitlementsupportdetail.py
index f2978a55246a..6a2abda7af52 100644
--- a/common/djangoapps/entitlements/migrations/0013_historicalcourseentitlementsupportdetail.py
+++ b/common/djangoapps/entitlements/migrations/0013_historicalcourseentitlementsupportdetail.py
@@ -22,19 +22,19 @@ class Migration(migrations.Migration): # lint-amnesty, pylint: disable=missing-
name='HistoricalCourseEntitlementSupportDetail',
fields=[
('id', models.IntegerField(auto_created=True, blank=True, db_index=True, verbose_name='ID')),
- ('created', model_utils.fields.AutoCreatedField(default=django.utils.timezone.now, editable=False, verbose_name='created')), # lint-amnesty, pylint: disable=line-too-long
- ('modified', model_utils.fields.AutoLastModifiedField(default=django.utils.timezone.now, editable=False, verbose_name='modified')), # lint-amnesty, pylint: disable=line-too-long
- ('reason', models.CharField(choices=[('LEAVE', 'Learner requested leave session for expired entitlement'), ('CHANGE', 'Learner requested session change for expired entitlement'), ('LEARNER_NEW', 'Learner requested new entitlement'), ('COURSE_TEAM_NEW', 'Course team requested entitlement for learnerg'), ('OTHER', 'Other')], max_length=15)), # lint-amnesty, pylint: disable=line-too-long
- ('action', models.CharField(choices=[('REISSUE', 'Re-issue entitlement'), ('CREATE', 'Create new entitlement')], max_length=15)), # lint-amnesty, pylint: disable=line-too-long
+ ('created', model_utils.fields.AutoCreatedField(default=django.utils.timezone.now, editable=False, verbose_name='created')),
+ ('modified', model_utils.fields.AutoLastModifiedField(default=django.utils.timezone.now, editable=False, verbose_name='modified')),
+ ('reason', models.CharField(choices=[('LEAVE', 'Learner requested leave session for expired entitlement'), ('CHANGE', 'Learner requested session change for expired entitlement'), ('LEARNER_NEW', 'Learner requested new entitlement'), ('COURSE_TEAM_NEW', 'Course team requested entitlement for learnerg'), ('OTHER', 'Other')], max_length=15)),
+ ('action', models.CharField(choices=[('REISSUE', 'Re-issue entitlement'), ('CREATE', 'Create new entitlement')], max_length=15)),
('comments', models.TextField(null=True)),
('history_id', models.AutoField(primary_key=True, serialize=False)),
('history_date', models.DateTimeField()),
('history_change_reason', models.CharField(max_length=100, null=True)),
- ('history_type', models.CharField(choices=[('+', 'Created'), ('~', 'Changed'), ('-', 'Deleted')], max_length=1)), # lint-amnesty, pylint: disable=line-too-long
- ('entitlement', models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='entitlements.CourseEntitlement')), # lint-amnesty, pylint: disable=line-too-long
- ('history_user', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to=settings.AUTH_USER_MODEL)), # lint-amnesty, pylint: disable=line-too-long
- ('support_user', models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to=settings.AUTH_USER_MODEL)), # lint-amnesty, pylint: disable=line-too-long
- ('unenrolled_run', models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='course_overviews.CourseOverview')), # lint-amnesty, pylint: disable=line-too-long
+ ('history_type', models.CharField(choices=[('+', 'Created'), ('~', 'Changed'), ('-', 'Deleted')], max_length=1)),
+ ('entitlement', models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='entitlements.CourseEntitlement')),
+ ('history_user', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to=settings.AUTH_USER_MODEL)),
+ ('support_user', models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to=settings.AUTH_USER_MODEL)),
+ ('unenrolled_run', models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='course_overviews.CourseOverview')),
],
options={
'ordering': ('-history_date', '-history_id'),
diff --git a/common/djangoapps/entitlements/migrations/0014_auto_20200115_2022.py b/common/djangoapps/entitlements/migrations/0014_auto_20200115_2022.py
index 2cf1ba1643fa..3b34dbcc799f 100644
--- a/common/djangoapps/entitlements/migrations/0014_auto_20200115_2022.py
+++ b/common/djangoapps/entitlements/migrations/0014_auto_20200115_2022.py
@@ -15,6 +15,6 @@ class Migration(migrations.Migration): # lint-amnesty, pylint: disable=missing-
migrations.AlterField(
model_name='courseentitlementsupportdetail',
name='unenrolled_run',
- field=models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, to='course_overviews.CourseOverview'), # lint-amnesty, pylint: disable=line-too-long
+ field=models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, to='course_overviews.CourseOverview'),
),
]
diff --git a/common/djangoapps/entitlements/rest_api/v1/tests/test_views.py b/common/djangoapps/entitlements/rest_api/v1/tests/test_views.py
index 9743a7021f1e..cc521652f416 100644
--- a/common/djangoapps/entitlements/rest_api/v1/tests/test_views.py
+++ b/common/djangoapps/entitlements/rest_api/v1/tests/test_views.py
@@ -32,7 +32,7 @@
# Entitlements is not in CMS' INSTALLED_APPS so these imports will error during test collection
if settings.ROOT_URLCONF == 'lms.urls':
- from common.djangoapps.entitlements.models import ( # lint-amnesty, pylint: disable=line-too-long
+ from common.djangoapps.entitlements.models import (
CourseEntitlement,
CourseEntitlementPolicy,
CourseEntitlementSupportDetail,
@@ -658,7 +658,7 @@ def test_get_entitlement_by_uuid(self):
assert response.status_code == 200
results = response.data
- assert results == CourseEntitlementSerializer(entitlement).data and results.get('expired_at') is None # noqa: PT018 # pylint: disable=line-too-long
+ assert results == CourseEntitlementSerializer(entitlement).data and results.get('expired_at') is None # noqa: PT018
def test_get_expired_entitlement_by_uuid(self):
past_datetime = now() - timedelta(days=365 * 2)
@@ -1148,7 +1148,7 @@ def test_user_can_revoke_and_refund(self, mock_course_uuid, mock_get_course_runs
assert course_entitlement.enrollment_course_run is None
assert course_entitlement.expired_at is not None
- @patch('common.djangoapps.entitlements.rest_api.v1.views.CourseEntitlement.is_entitlement_refundable', return_value=False) # lint-amnesty, pylint: disable=line-too-long
+ @patch('common.djangoapps.entitlements.rest_api.v1.views.CourseEntitlement.is_entitlement_refundable', return_value=False) # noqa: E501
@patch('common.djangoapps.entitlements.models.refund_entitlement', return_value=True)
@patch('common.djangoapps.entitlements.rest_api.v1.views.get_course_runs_for_course')
def test_user_can_revoke_and_no_refund_available(
@@ -1192,7 +1192,7 @@ def test_user_can_revoke_and_no_refund_available(
assert course_entitlement.enrollment_course_run is not None
assert course_entitlement.expired_at is None
- @patch('common.djangoapps.entitlements.rest_api.v1.views.CourseEntitlement.is_entitlement_refundable', return_value=True) # lint-amnesty, pylint: disable=line-too-long
+ @patch('common.djangoapps.entitlements.rest_api.v1.views.CourseEntitlement.is_entitlement_refundable', return_value=True) # noqa: E501
@patch('common.djangoapps.entitlements.models.refund_entitlement', return_value=False)
@patch("common.djangoapps.entitlements.rest_api.v1.views.get_course_runs_for_course")
def test_user_is_not_unenrolled_on_failed_refund(
diff --git a/common/djangoapps/entitlements/rest_api/v1/views.py b/common/djangoapps/entitlements/rest_api/v1/views.py
index 08d9ecc38e17..62fb6aaeb742 100644
--- a/common/djangoapps/entitlements/rest_api/v1/views.py
+++ b/common/djangoapps/entitlements/rest_api/v1/views.py
@@ -17,7 +17,7 @@
from rest_framework.response import Response
from common.djangoapps.course_modes.models import CourseMode
-from common.djangoapps.entitlements.models import ( # lint-amnesty, pylint: disable=line-too-long
+from common.djangoapps.entitlements.models import (
CourseEntitlement,
CourseEntitlementPolicy,
CourseEntitlementSupportDetail,
@@ -300,12 +300,12 @@ def partial_update(self, request, *args, **kwargs):
support_detail['unenrolled_run'] = CourseOverview.objects.get(id=unenrolled_run_course_key)
except (InvalidKeyError, CourseOverview.DoesNotExist) as error:
return HttpResponseBadRequest(
- 'Error raised while trying to unenroll user {user} from course run {course_id}: {error}' # noqa: UP032 # pylint: disable=line-too-long
+ 'Error raised while trying to unenroll user {user} from course run {course_id}: {error}' # noqa: UP032
.format(user=entitlement.user.username, course_id=unenrolled_run_id, error=error)
)
CourseEntitlementSupportDetail.objects.create(**support_detail)
- return super().partial_update(request, *args, **kwargs) # lint-amnesty, pylint: disable=no-member, super-with-arguments
+ return super().partial_update(request, *args, **kwargs) # pylint: disable=no-member, super-with-arguments
class EntitlementEnrollmentViewSet(viewsets.GenericViewSet):
@@ -430,7 +430,7 @@ def create(self, request, uuid):
return Response(
status=status.HTTP_400_BAD_REQUEST,
data={
- 'message': 'The User is unable to enroll in Course Run {course_id}, it is not available.'.format( # noqa: UP032 # pylint: disable=line-too-long
+ 'message': 'The User is unable to enroll in Course Run {course_id}, it is not available.'.format( # noqa: UP032
course_id=course_run_id
)
}
diff --git a/common/djangoapps/entitlements/tasks.py b/common/djangoapps/entitlements/tasks.py
index 74229dcb1437..4e2821311d12 100644
--- a/common/djangoapps/entitlements/tasks.py
+++ b/common/djangoapps/entitlements/tasks.py
@@ -65,7 +65,7 @@ def expire_old_entitlements(self, start, end, logid='...'):
# The call above is idempotent, so retry at will
raise self.retry(exc=exc, countdown=countdown, max_retries=MAX_RETRIES) # noqa: B904
- LOGGER.info('Successfully completed the task expire_old_entitlements after examining %d entries [%s]', entitlements.count(), logid) # lint-amnesty, pylint: disable=line-too-long
+ LOGGER.info('Successfully completed the task expire_old_entitlements after examining %d entries [%s]', entitlements.count(), logid) # noqa: E501
@shared_task(bind=True)
diff --git a/common/djangoapps/entitlements/tests/factories.py b/common/djangoapps/entitlements/tests/factories.py
index e4c5a86ad3f7..85bf666a1f1e 100644
--- a/common/djangoapps/entitlements/tests/factories.py
+++ b/common/djangoapps/entitlements/tests/factories.py
@@ -22,7 +22,7 @@ class Meta:
site = factory.SubFactory(SiteFactory)
-class CourseEntitlementFactory(factory.django.DjangoModelFactory): # lint-amnesty, pylint: disable=missing-class-docstring
+class CourseEntitlementFactory(factory.django.DjangoModelFactory): # pylint: disable=missing-class-docstring
class Meta:
model = CourseEntitlement
diff --git a/common/djangoapps/entitlements/tests/test_utils.py b/common/djangoapps/entitlements/tests/test_utils.py
index 0be720b2aa57..6e7f85f07b94 100644
--- a/common/djangoapps/entitlements/tests/test_utils.py
+++ b/common/djangoapps/entitlements/tests/test_utils.py
@@ -11,7 +11,7 @@
from common.djangoapps.course_modes.models import CourseMode
from common.djangoapps.course_modes.tests.factories import CourseModeFactory
-from common.djangoapps.student.tests.factories import ( # lint-amnesty, pylint: disable=line-too-long
+from common.djangoapps.student.tests.factories import (
TEST_PASSWORD,
CourseEnrollmentFactory,
CourseOverviewFactory,
diff --git a/common/djangoapps/pipeline_mako/tests/test_render.py b/common/djangoapps/pipeline_mako/tests/test_render.py
index 8e37e8e2f99a..7e9afd7e8414 100644
--- a/common/djangoapps/pipeline_mako/tests/test_render.py
+++ b/common/djangoapps/pipeline_mako/tests/test_render.py
@@ -53,7 +53,7 @@ def mock_staticfiles_lookup(path):
(True,),
(False,),
)
- def test_compressed_css(self, pipeline_enabled, mock_staticfiles_lookup): # lint-amnesty, pylint: disable=unused-argument
+ def test_compressed_css(self, pipeline_enabled, mock_staticfiles_lookup): # pylint: disable=unused-argument
"""
Verify the behavior of compressed_css, with the pipeline
both enabled and disabled.
@@ -71,7 +71,7 @@ def test_compressed_css(self, pipeline_enabled, mock_staticfiles_lookup): # lin
@patch('django.contrib.staticfiles.storage.staticfiles_storage.exists', return_value=True)
@patch('common.djangoapps.static_replace.try_staticfiles_lookup', side_effect=mock_staticfiles_lookup)
- def test_compressed_js(self, mock_staticfiles_lookup, mock_staticfiles_exists): # lint-amnesty, pylint: disable=unused-argument
+ def test_compressed_js(self, mock_staticfiles_lookup, mock_staticfiles_exists): # pylint: disable=unused-argument
"""
Verify the behavior of compressed_css, with the pipeline
both enabled and disabled.
diff --git a/common/djangoapps/static_replace/test/test_static_replace.py b/common/djangoapps/static_replace/test/test_static_replace.py
index 1d6cc6fe43f5..10b924b637dd 100644
--- a/common/djangoapps/static_replace/test/test_static_replace.py
+++ b/common/djangoapps/static_replace/test/test_static_replace.py
@@ -151,7 +151,7 @@ def test_mongo_filestore(mock_get_excluded_extensions, mock_get_base_url, mock_m
@patch('common.djangoapps.static_replace.settings', autospec=True)
@patch('xmodule.modulestore.django.modulestore', autospec=True)
@patch('common.djangoapps.static_replace.staticfiles_storage', autospec=True)
-def test_data_dir_fallback(mock_storage, mock_modulestore, mock_settings): # lint-amnesty, pylint: disable=unused-argument
+def test_data_dir_fallback(mock_storage, mock_modulestore, mock_settings): # pylint: disable=unused-argument
mock_modulestore.return_value = Mock(XMLModuleStore)
mock_storage.url.side_effect = Exception
@@ -185,8 +185,8 @@ def test_static_url_with_query(mock_modulestore, mock_storage):
mock_storage.exists.return_value = False
mock_modulestore.return_value = Mock(MongoModuleStore)
- pre_text = 'EMBED src ="/static/LAlec04_controller.swf?csConfigFile=/static/LAlec04_config.xml&name1=value1&name2=value2"' # lint-amnesty, pylint: disable=line-too-long
- post_text = 'EMBED src ="/c4x/org/course/asset/LAlec04_controller.swf?csConfigFile=%2Fc4x%2Forg%2Fcourse%2Fasset%2FLAlec04_config.xml&name1=value1&name2=value2"' # lint-amnesty, pylint: disable=line-too-long
+ pre_text = 'EMBED src ="/static/LAlec04_controller.swf?csConfigFile=/static/LAlec04_config.xml&name1=value1&name2=value2"' # noqa: E501
+ post_text = 'EMBED src ="/c4x/org/course/asset/LAlec04_controller.swf?csConfigFile=%2Fc4x%2Forg%2Fcourse%2Fasset%2FLAlec04_config.xml&name1=value1&name2=value2"' # noqa: E501
assert replace_static_urls(pre_text, DATA_DIRECTORY, COURSE_KEY) == post_text
@@ -205,13 +205,13 @@ def test_static_paths_out(mock_modulestore, mock_storage):
mock_modulestore.return_value = Mock(MongoModuleStore)
static_url = '/static/LAlec04_controller.swf?csConfigFile=/static/LAlec04_config.xml&name1=value1&name2=value2'
- static_course_url = '/c4x/org/course/asset/LAlec04_controller.swf?csConfigFile=%2Fc4x%2Forg%2Fcourse%2Fasset%2FLAlec04_config.xml&name1=value1&name2=value2' # lint-amnesty, pylint: disable=line-too-long
+ static_course_url = '/c4x/org/course/asset/LAlec04_controller.swf?csConfigFile=%2Fc4x%2Forg%2Fcourse%2Fasset%2FLAlec04_config.xml&name1=value1&name2=value2' # noqa: E501
raw_url = '/static/js/capa/protex/protex.nocache.js?raw'
xblock_url = '/static/xblock/resources/babys_first.lil_xblock/public/images/pacifier.png'
# xss-lint: disable=python-wrap-html
pre_text = f'EMBED src ="{static_url}" xblock={xblock_url} text
')
diff --git a/common/djangoapps/status/status.py b/common/djangoapps/status/status.py
index a23a49dba866..e575bf4e8917 100644
--- a/common/djangoapps/status/status.py
+++ b/common/djangoapps/status/status.py
@@ -24,6 +24,6 @@ def get_site_status_msg(course_key):
return GlobalStatusMessage.current().full_message(course_key)
# Make as general as possible, because something broken here should not
# bring down the whole site.
- except: # pylint: disable=bare-except
+ except: # noqa: E722
log.exception("Error while getting a status message.")
return None
diff --git a/common/djangoapps/student/admin.py b/common/djangoapps/student/admin.py
index 8a54a96e514f..b7c446b1adb7 100644
--- a/common/djangoapps/student/admin.py
+++ b/common/djangoapps/student/admin.py
@@ -141,7 +141,7 @@ class Meta:
fields = '__all__' # noqa: DJ007
email = forms.EmailField(required=True)
- COURSE_ACCESS_ROLES = [(role_name, role_name) for role_name in REGISTERED_ACCESS_ROLES.keys()] # lint-amnesty, pylint: disable=consider-iterating-dictionary
+ COURSE_ACCESS_ROLES = [(role_name, role_name) for role_name in REGISTERED_ACCESS_ROLES.keys()] # pylint: disable=consider-iterating-dictionary
role = forms.ChoiceField(choices=COURSE_ACCESS_ROLES)
def clean_course_id(self):
@@ -373,7 +373,7 @@ def __init__(self, *args, **kwargs):
try:
args_copy['course'] = CourseKey.from_string(args_copy['course'])
except InvalidKeyError:
- raise forms.ValidationError("Cannot make a valid CourseKey from id {}!".format(args_copy['course'])) # lint-amnesty, pylint: disable=raise-missing-from,line-too-long # noqa: B904
+ raise forms.ValidationError("Cannot make a valid CourseKey from id {}!".format(args_copy['course'])) # pylint: disable=raise-missing-from # noqa: B904
args = [args_copy]
super().__init__(*args, **kwargs)
@@ -392,7 +392,7 @@ def clean_course_id(self): # lint-amnesty, pylint: disable=missing-function-doc
try:
course_key = CourseKey.from_string(course_id)
except InvalidKeyError:
- raise forms.ValidationError(f"Cannot make a valid CourseKey from id {course_id}!") # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904
+ raise forms.ValidationError(f"Cannot make a valid CourseKey from id {course_id}!") # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904, E501
if not modulestore().has_course(course_key):
raise forms.ValidationError(f"Cannot find course with id {course_id} in the modulestore")
@@ -438,7 +438,7 @@ def get_search_results(self, request, queryset, search_term):
return qs, use_distinct
def get_queryset(self, request):
- return super().get_queryset(request).select_related('user') # lint-amnesty, pylint: disable=no-member, super-with-arguments
+ return super().get_queryset(request).select_related('user') # pylint: disable=no-member, super-with-arguments
@method_decorator(login_required, name='dispatch')
@@ -556,8 +556,8 @@ class UserAdmin(BaseUserAdmin):
def get_readonly_fields(self, request, obj=None):
"""
Allows editing the users while skipping the username check, so we can have Unicode username with no problems.
- The username is marked read-only when editing existing users regardless of `ENABLE_UNICODE_USERNAME`, to simplify the bokchoy tests. # lint-amnesty, pylint: disable=line-too-long
- """
+ The username is marked read-only when editing existing users regardless of `ENABLE_UNICODE_USERNAME`, to simplify the bokchoy tests.
+ """ # noqa: E501
django_readonly = super().get_readonly_fields(request, obj)
if obj:
return django_readonly + ('username',)
@@ -716,7 +716,7 @@ def clean_email(self):
)
elif email_domain != allowed_site_email_domain:
raise forms.ValidationError(
- _(f"Email doesn't have {allowed_site_email_domain} domain name.") # lint-amnesty, pylint: disable=translation-of-non-string
+ _(f"Email doesn't have {allowed_site_email_domain} domain name.") # pylint: disable=translation-of-non-string
)
elif not User.objects.filter(email=email).exists():
raise forms.ValidationError(_("User with this email doesn't exist in system."))
diff --git a/common/djangoapps/student/auth.py b/common/djangoapps/student/auth.py
index 4071b2119e9a..d7fdb0bcae3c 100644
--- a/common/djangoapps/student/auth.py
+++ b/common/djangoapps/student/auth.py
@@ -44,7 +44,7 @@ def is_ccx_course(course_key):
Check whether the course locator maps to a CCX course; this is important
because we don't allow access to CCX courses in Studio.
"""
- return isinstance(course_key, CCXLocator) or isinstance(course_key, CCXBlockUsageLocator) # lint-amnesty, pylint: disable=consider-merging-isinstance
+ return isinstance(course_key, CCXLocator) or isinstance(course_key, CCXBlockUsageLocator) # pylint: disable=consider-merging-isinstance
def user_has_role(user, role):
@@ -336,7 +336,7 @@ def _check_caller_authority(caller, role):
if GlobalStaff().has_user(caller):
return
- if isinstance(role, (GlobalStaff, CourseCreatorRole, OrgContentCreatorRole)): # lint-amnesty, pylint: disable=no-else-raise
+ if isinstance(role, (GlobalStaff, CourseCreatorRole, OrgContentCreatorRole)): # pylint: disable=no-else-raise
raise PermissionDenied
elif isinstance(role, CourseRole): # instructors can change the roles w/in their course
if not user_has_role(caller, CourseInstructorRole(role.course_key)):
diff --git a/common/djangoapps/student/management/commands/add_to_group.py b/common/djangoapps/student/management/commands/add_to_group.py
index 4f48264e1c9d..854fe17784f9 100644
--- a/common/djangoapps/student/management/commands/add_to_group.py
+++ b/common/djangoapps/student/management/commands/add_to_group.py
@@ -47,7 +47,7 @@ def handle(self, *args, **options):
group = Group(name=group_name)
group.save()
else:
- raise CommandError(f'Group {group_name} does not exist') # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904
+ raise CommandError(f'Group {group_name} does not exist') # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904, E501
if options['remove']:
user.groups.remove(group)
diff --git a/common/djangoapps/student/management/commands/anonymized_id_mapping.py b/common/djangoapps/student/management/commands/anonymized_id_mapping.py
index 7e67540a1177..c904a6433d29 100644
--- a/common/djangoapps/student/management/commands/anonymized_id_mapping.py
+++ b/common/djangoapps/student/management/commands/anonymized_id_mapping.py
@@ -58,4 +58,4 @@ def handle(self, *args, **options):
anonymous_id_for_user(student, course_key)
))
except OSError:
- raise CommandError("Error writing to file: %s" % output_filename) # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904, UP031
+ raise CommandError("Error writing to file: %s" % output_filename) # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904, E501, UP031
diff --git a/common/djangoapps/student/management/commands/assigngroups.py b/common/djangoapps/student/management/commands/assigngroups.py
index 236b63b45ed6..a7b3d417c7a5 100644
--- a/common/djangoapps/student/management/commands/assigngroups.py
+++ b/common/djangoapps/student/management/commands/assigngroups.py
@@ -74,7 +74,7 @@ def handle(self, *args, **options):
for group in dict(groups):
utg = UserTestGroup()
utg.name = group
- utg.description = json.dumps({"description": options['description']}, # lint-amnesty, pylint: disable=too-many-function-args
+ utg.description = json.dumps({"description": options['description']}, # pylint: disable=too-many-function-args
{"time": datetime.datetime.now(ZoneInfo("UTC")).isoformat()})
group_objects[group] = utg
group_objects[group].save()
diff --git a/common/djangoapps/student/management/commands/bulk_change_enrollment.py b/common/djangoapps/student/management/commands/bulk_change_enrollment.py
index 9d827a8e2f4f..1464fa5da26d 100644
--- a/common/djangoapps/student/management/commands/bulk_change_enrollment.py
+++ b/common/djangoapps/student/management/commands/bulk_change_enrollment.py
@@ -67,7 +67,7 @@ def handle(self, *args, **options):
try:
course_key = CourseKey.from_string(course_id)
except InvalidKeyError:
- raise CommandError(f'Course ID {course_id} is invalid.') # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904
+ raise CommandError(f'Course ID {course_id} is invalid.') # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904, E501
if modulestore().get_course(course_key) is None:
raise CommandError(f'The given course {course_id} does not exist.')
diff --git a/common/djangoapps/student/management/commands/change_enrollment.py b/common/djangoapps/student/management/commands/change_enrollment.py
index 9fe8ef79d055..050f02824617 100644
--- a/common/djangoapps/student/management/commands/change_enrollment.py
+++ b/common/djangoapps/student/management/commands/change_enrollment.py
@@ -76,7 +76,7 @@ def handle(self, *args, **options):
try:
course_key = CourseKey.from_string(options['course_id'])
except InvalidKeyError:
- raise CommandError('Invalid or non-existant course id {}'.format(options['course_id'])) # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904
+ raise CommandError('Invalid or non-existant course id {}'.format(options['course_id'])) # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904, E501
if not options['username'] and not options['email']:
raise CommandError('You must include usernames (-u) or emails (-e) to select users to update')
@@ -97,7 +97,7 @@ def handle(self, *args, **options):
self.report(error_users, success_users)
- def update_enrollments(self, identifier, enrollment_args, options, error_users, success_users, enrollment_attrs=None): # lint-amnesty, pylint: disable=line-too-long
+ def update_enrollments(self, identifier, enrollment_args, options, error_users, success_users, enrollment_attrs=None): # noqa: E501
""" Update enrollments for a specific user identifier (email or username). """
users = options[identifier].split(",")
diff --git a/common/djangoapps/student/management/commands/unsubscribe_user_email.py b/common/djangoapps/student/management/commands/unsubscribe_user_email.py
index 1e79895d6309..6fd1f2ec1192 100644
--- a/common/djangoapps/student/management/commands/unsubscribe_user_email.py
+++ b/common/djangoapps/student/management/commands/unsubscribe_user_email.py
@@ -54,7 +54,7 @@ def handle(self, *args, **options):
reader = list(csv.DictReader(csv_file))
emails = [row.get('email') for row in reader]
except FileNotFoundError as exc:
- raise CommandError(f"Error: File not found due to exception - {exc}") # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904
+ raise CommandError(f"Error: File not found due to exception - {exc}") # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904, E501
except csv.Error as exc:
logger.exception(f"CSV error: {exc}")
else:
diff --git a/common/djangoapps/student/models/course_enrollment.py b/common/djangoapps/student/models/course_enrollment.py
index 4b61608b6294..326072aa146c 100644
--- a/common/djangoapps/student/models/course_enrollment.py
+++ b/common/djangoapps/student/models/course_enrollment.py
@@ -1451,7 +1451,7 @@ def _update_enrollment_state_in_request_cache(cls, user, course_key, enrollment_
user.id, course_key, enrollment_state)
@classmethod
- def _update_enrollment_state_in_cache(cls, cache, user_id, course_key, enrollment_state): # lint-amnesty, pylint: disable=redefined-outer-name
+ def _update_enrollment_state_in_cache(cls, cache, user_id, course_key, enrollment_state): # pylint: disable=redefined-outer-name
"""
Updates the cached value for the user's enrollment in the
given cache.
diff --git a/common/djangoapps/student/models/user.py b/common/djangoapps/student/models/user.py
index 6b7cdb7e761a..fae4d1ba11b9 100644
--- a/common/djangoapps/student/models/user.py
+++ b/common/djangoapps/student/models/user.py
@@ -437,7 +437,7 @@ class Meta:
# CRITICAL TODO/SECURITY
# Sanitize all fields.
# This is not visible to other users, but could introduce holes later
- user = models.OneToOneField(User, unique=True, db_index=True, related_name='profile', on_delete=models.CASCADE) # noqa: DJ012 # pylint: disable=line-too-long
+ user = models.OneToOneField(User, unique=True, db_index=True, related_name='profile', on_delete=models.CASCADE) # noqa: DJ012
name = models.CharField(blank=True, max_length=255, db_index=True)
# How meta field works: meta will only store those fields which are available in extended_profile configuration,
@@ -700,7 +700,7 @@ def user_profile_pre_save_callback(sender, **kwargs):
# Cache "old" field values on the model instance so that they can be
# retrieved in the post_save callback when we emit an event with new and
# old field values.
- user_profile._changed_fields = get_changed_fields_dict(user_profile, sender) # lint-amnesty, pylint: disable=protected-access
+ user_profile._changed_fields = get_changed_fields_dict(user_profile, sender) # pylint: disable=protected-access
@receiver(post_save, sender=UserProfile)
@@ -1089,7 +1089,7 @@ def __eq__(self, other): # noqa: DJ012
Overriding eq b/c the django impl relies on the primary key which requires fetch. sometimes we
just want to compare roles w/o doing another fetch.
"""
- return type(self) == type(other) and self._key == other._key # lint-amnesty, pylint: disable=protected-access, unidiomatic-typecheck
+ return type(self) == type(other) and self._key == other._key # pylint: disable=protected-access, unidiomatic-typecheck
def __hash__(self):
return hash(self._key)
@@ -1101,7 +1101,7 @@ def __lt__(self, other):
return self._key < other._key
def __str__(self):
- return f"[CourseAccessRole] user: {self.user.username} role: {self.role} org: {self.org} course: {self.course_id}" # lint-amnesty, pylint: disable=line-too-long
+ return f"[CourseAccessRole] user: {self.user.username} role: {self.role} org: {self.org} course: {self.course_id}" # noqa: E501
class CourseAccessRoleHistory(TimeStampedModel):
diff --git a/common/djangoapps/student/tests/factories.py b/common/djangoapps/student/tests/factories.py
index 30b11ca38e84..e65d4c28d3a4 100644
--- a/common/djangoapps/student/tests/factories.py
+++ b/common/djangoapps/student/tests/factories.py
@@ -107,7 +107,7 @@ def profile(obj, create, extracted, **kwargs): # pylint: disable=unused-argumen
return None
@factory.post_generation
- def groups(self, create, extracted, **kwargs): # lint-amnesty, pylint: disable=missing-function-docstring, unused-argument
+ def groups(self, create, extracted, **kwargs): # pylint: disable=missing-function-docstring, unused-argument
if extracted is None:
return
@@ -115,7 +115,7 @@ def groups(self, create, extracted, **kwargs): # lint-amnesty, pylint: disable=
extracted = [extracted]
for group_name in extracted:
- self.groups.add(GroupFactory.simple_generate(create, name=group_name)) # lint-amnesty, pylint: disable=no-member
+ self.groups.add(GroupFactory.simple_generate(create, name=group_name)) # pylint: disable=no-member
class UserAttributeFactory(DjangoModelFactory): # lint-amnesty, pylint: disable=missing-class-docstring
diff --git a/common/djangoapps/student/tests/test_admin_views.py b/common/djangoapps/student/tests/test_admin_views.py
index cc7db739faeb..8015acfe734b 100644
--- a/common/djangoapps/student/tests/test_admin_views.py
+++ b/common/djangoapps/student/tests/test_admin_views.py
@@ -18,7 +18,7 @@
from django.utils.timezone import now
from edx_toggles.toggles.testutils import override_waffle_switch
-from common.djangoapps.student.admin import ( # lint-amnesty, pylint: disable=line-too-long
+from common.djangoapps.student.admin import (
COURSE_ENROLLMENT_ADMIN_SWITCH,
AllowedAuthUserForm,
CourseEnrollmentForm,
diff --git a/common/djangoapps/student/tests/test_email.py b/common/djangoapps/student/tests/test_email.py
index d9aa2dd19662..8d7f5e26c4f8 100644
--- a/common/djangoapps/student/tests/test_email.py
+++ b/common/djangoapps/student/tests/test_email.py
@@ -352,7 +352,7 @@ def assertFailedRequest(self, response_data, expected_error):
assert self.user.email_user.called is False
@patch('common.djangoapps.student.views.management.render_to_string',
- Mock(side_effect=mock_render_to_string, autospec=True)) # lint-amnesty, pylint: disable=line-too-long
+ Mock(side_effect=mock_render_to_string, autospec=True))
def test_duplicate_activation_key(self):
"""
Assert that if two users change Email address simultaneously, no error is thrown
@@ -389,7 +389,7 @@ def test_email_failure(self, send_mail):
Test the return value if sending the email for the user to click fails.
"""
send_mail.side_effect = [Exception, None]
- with self.assertRaisesRegex(ValueError, 'Unable to send email activation link. Please try again later.'): # noqa: PT027 # pylint: disable=line-too-long
+ with self.assertRaisesRegex(ValueError, 'Unable to send email activation link. Please try again later.'): # noqa: PT027
self.do_email_change(self.user, "valid@email.com")
self.assert_no_events_were_emitted()
@@ -442,9 +442,9 @@ def _assert_email(self, subject, body_fragments):
@ddt.ddt
@patch('common.djangoapps.student.views.management.render_to_response',
- Mock(side_effect=mock_render_to_response, autospec=True)) # lint-amnesty, pylint: disable=line-too-long
+ Mock(side_effect=mock_render_to_response, autospec=True))
@patch('common.djangoapps.student.views.management.render_to_string',
- Mock(side_effect=mock_render_to_string, autospec=True)) # lint-amnesty, pylint: disable=line-too-long
+ Mock(side_effect=mock_render_to_string, autospec=True))
class EmailChangeConfirmationTests(EmailTestMixin, EmailTemplateTagMixin, CacheIsolationMixin, TransactionTestCase):
"""
Test that confirmation of email change requests function even in the face of exceptions thrown while sending email
@@ -679,7 +679,7 @@ def test_email_failure(self, send_mail):
Test the return value if sending the email for the user to click fails.
"""
send_mail.side_effect = [Exception, None]
- with self.assertRaisesRegex(ValueError, 'Unable to send email activation link. Please try again later.'): # noqa: PT027 # pylint: disable=line-too-long
+ with self.assertRaisesRegex(ValueError, 'Unable to send email activation link. Please try again later.'): # noqa: PT027
self.do_secondary_email_change(self.user, "valid@email.com")
self.assert_no_events_were_emitted()
diff --git a/common/djangoapps/student/tests/test_events.py b/common/djangoapps/student/tests/test_events.py
index c6f9ff299c26..1c4d01abb35a 100644
--- a/common/djangoapps/student/tests/test_events.py
+++ b/common/djangoapps/student/tests/test_events.py
@@ -187,7 +187,7 @@ def test_enrolled_after_email_change(self):
"""
Test that when a user's email changes, the user is enrolled in pending courses.
"""
- pending_enrollment = CourseEnrollmentAllowedFactory(auto_enroll=True) # lint-amnesty, pylint: disable=unused-variable
+ pending_enrollment = CourseEnrollmentAllowedFactory(auto_enroll=True) # pylint: disable=unused-variable
# Create a CourseOverview for the enrollment course
course_overview = CourseOverviewFactory.create(id=pending_enrollment.course_id)
diff --git a/common/djangoapps/student/tests/test_long_username_email.py b/common/djangoapps/student/tests/test_long_username_email.py
index 337929acb271..d26d0cecdc1c 100644
--- a/common/djangoapps/student/tests/test_long_username_email.py
+++ b/common/djangoapps/student/tests/test_long_username_email.py
@@ -41,7 +41,7 @@ def test_spoffed_name(self):
"""
Test name cannot contain html.
"""
- self.url_params['name'] = '
Name
NameFeb 14, 2013 ')
def test_invalid_format_string(self):
dtime = datetime(2013, 2, 14, 16, 41, 17)
- with self.assertRaisesRegex(AssertionError, 'format "NOPE" not yet supported in strftime_localized_html'): # noqa: PT027 # pylint: disable=line-too-long
+ with self.assertRaisesRegex(AssertionError, 'format "NOPE" not yet supported in strftime_localized_html'): # noqa: PT027
strftime_localized_html(dtime, 'NOPE')
diff --git a/common/djangoapps/util/tests/test_password_policy_validators.py b/common/djangoapps/util/tests/test_password_policy_validators.py
index 23e9252839dd..b085ef3b11f5 100644
--- a/common/djangoapps/util/tests/test_password_policy_validators.py
+++ b/common/djangoapps/util/tests/test_password_policy_validators.py
@@ -83,25 +83,25 @@ def test_password_unicode_normalization(self):
'This password is too short. It must contain at least 4 characters.')
@data(
- ([create_validator_config('common.djangoapps.util.password_policy_validators.MinimumLengthValidator', {'min_length': 2})], # lint-amnesty, pylint: disable=line-too-long
+ ([create_validator_config('common.djangoapps.util.password_policy_validators.MinimumLengthValidator', {'min_length': 2})], # noqa: E501
'at least 2 characters.'),
([
- create_validator_config('common.djangoapps.util.password_policy_validators.MinimumLengthValidator', {'min_length': 2}), # lint-amnesty, pylint: disable=line-too-long
- create_validator_config('common.djangoapps.util.password_policy_validators.AlphabeticValidator', {'min_alphabetic': 2}), # lint-amnesty, pylint: disable=line-too-long
+ create_validator_config('common.djangoapps.util.password_policy_validators.MinimumLengthValidator', {'min_length': 2}), # noqa: E501
+ create_validator_config('common.djangoapps.util.password_policy_validators.AlphabeticValidator', {'min_alphabetic': 2}), # noqa: E501
], 'characters, including 2 letters.'),
([
- create_validator_config('common.djangoapps.util.password_policy_validators.MinimumLengthValidator', {'min_length': 2}), # lint-amnesty, pylint: disable=line-too-long
- create_validator_config('common.djangoapps.util.password_policy_validators.AlphabeticValidator', {'min_alphabetic': 2}), # lint-amnesty, pylint: disable=line-too-long
- create_validator_config('common.djangoapps.util.password_policy_validators.NumericValidator', {'min_numeric': 1}), # lint-amnesty, pylint: disable=line-too-long
+ create_validator_config('common.djangoapps.util.password_policy_validators.MinimumLengthValidator', {'min_length': 2}), # noqa: E501
+ create_validator_config('common.djangoapps.util.password_policy_validators.AlphabeticValidator', {'min_alphabetic': 2}), # noqa: E501
+ create_validator_config('common.djangoapps.util.password_policy_validators.NumericValidator', {'min_numeric': 1}), # noqa: E501
], 'characters, including 2 letters & 1 number.'),
([
- create_validator_config('common.djangoapps.util.password_policy_validators.MinimumLengthValidator', {'min_length': 2}), # lint-amnesty, pylint: disable=line-too-long
- create_validator_config('common.djangoapps.util.password_policy_validators.UppercaseValidator', {'min_upper': 3}), # lint-amnesty, pylint: disable=line-too-long
- create_validator_config('common.djangoapps.util.password_policy_validators.NumericValidator', {'min_numeric': 1}), # lint-amnesty, pylint: disable=line-too-long
- create_validator_config('common.djangoapps.util.password_policy_validators.SymbolValidator', {'min_symbol': 2}), # lint-amnesty, pylint: disable=line-too-long
+ create_validator_config('common.djangoapps.util.password_policy_validators.MinimumLengthValidator', {'min_length': 2}), # noqa: E501
+ create_validator_config('common.djangoapps.util.password_policy_validators.UppercaseValidator', {'min_upper': 3}), # noqa: E501
+ create_validator_config('common.djangoapps.util.password_policy_validators.NumericValidator', {'min_numeric': 1}), # noqa: E501
+ create_validator_config('common.djangoapps.util.password_policy_validators.SymbolValidator', {'min_symbol': 2}), # noqa: E501
], 'including 3 uppercase letters & 1 number & 2 symbols.'),
)
@unpack
@@ -126,13 +126,13 @@ def test_user_attribute_similarity_validation_errors(self, password, username, e
self.validation_errors_checker(password, msg, user)
@data(
- ([create_validator_config('common.djangoapps.util.password_policy_validators.MinimumLengthValidator', {'min_length': 1})], # lint-amnesty, pylint: disable=line-too-long
+ ([create_validator_config('common.djangoapps.util.password_policy_validators.MinimumLengthValidator', {'min_length': 1})], # noqa: E501
'', 'This password is too short. It must contain at least 1 character.'),
- ([create_validator_config('common.djangoapps.util.password_policy_validators.MinimumLengthValidator', {'min_length': 8})], # lint-amnesty, pylint: disable=line-too-long
+ ([create_validator_config('common.djangoapps.util.password_policy_validators.MinimumLengthValidator', {'min_length': 8})], # noqa: E501
'd', 'This password is too short. It must contain at least 8 characters.'),
- ([create_validator_config('common.djangoapps.util.password_policy_validators.MinimumLengthValidator', {'min_length': 8})], # lint-amnesty, pylint: disable=line-too-long
+ ([create_validator_config('common.djangoapps.util.password_policy_validators.MinimumLengthValidator', {'min_length': 8})], # noqa: E501
'longpassword', None),
)
@unpack
@@ -142,13 +142,13 @@ def test_minimum_length_validation_errors(self, config, password, msg):
self.validation_errors_checker(password, msg)
@data(
- ([create_validator_config('common.djangoapps.util.password_policy_validators.MaximumLengthValidator', {'max_length': 1})], # lint-amnesty, pylint: disable=line-too-long
+ ([create_validator_config('common.djangoapps.util.password_policy_validators.MaximumLengthValidator', {'max_length': 1})], # noqa: E501
'longpassword', 'This password is too long. It must contain no more than 1 character.'),
- ([create_validator_config('common.djangoapps.util.password_policy_validators.MaximumLengthValidator', {'max_length': 10})], # lint-amnesty, pylint: disable=line-too-long
+ ([create_validator_config('common.djangoapps.util.password_policy_validators.MaximumLengthValidator', {'max_length': 10})], # noqa: E501
'longpassword', 'This password is too long. It must contain no more than 10 characters.'),
- ([create_validator_config('common.djangoapps.util.password_policy_validators.MaximumLengthValidator', {'max_length': 20})], # lint-amnesty, pylint: disable=line-too-long
+ ([create_validator_config('common.djangoapps.util.password_policy_validators.MaximumLengthValidator', {'max_length': 20})], # noqa: E501
'shortpassword', None),
)
@unpack
@@ -170,13 +170,13 @@ def test_common_password_validation_errors(self, password, msg):
self.validation_errors_checker(password, msg)
@data(
- ([create_validator_config('common.djangoapps.util.password_policy_validators.AlphabeticValidator', {'min_alphabetic': 1})], # lint-amnesty, pylint: disable=line-too-long
+ ([create_validator_config('common.djangoapps.util.password_policy_validators.AlphabeticValidator', {'min_alphabetic': 1})], # noqa: E501
'12345', 'This password must contain at least 1 letter.'),
- ([create_validator_config('common.djangoapps.util.password_policy_validators.AlphabeticValidator', {'min_alphabetic': 5})], # lint-amnesty, pylint: disable=line-too-long
+ ([create_validator_config('common.djangoapps.util.password_policy_validators.AlphabeticValidator', {'min_alphabetic': 5})], # noqa: E501
'test123', 'This password must contain at least 5 letters.'),
- ([create_validator_config('common.djangoapps.util.password_policy_validators.AlphabeticValidator', {'min_alphabetic': 2})], # lint-amnesty, pylint: disable=line-too-long
+ ([create_validator_config('common.djangoapps.util.password_policy_validators.AlphabeticValidator', {'min_alphabetic': 2})], # noqa: E501
'password', None),
)
@unpack
@@ -186,13 +186,13 @@ def test_alphabetic_validation_errors(self, config, password, msg):
self.validation_errors_checker(password, msg)
@data(
- ([create_validator_config('common.djangoapps.util.password_policy_validators.NumericValidator', {'min_numeric': 1})], # lint-amnesty, pylint: disable=line-too-long
+ ([create_validator_config('common.djangoapps.util.password_policy_validators.NumericValidator', {'min_numeric': 1})], # noqa: E501
'test', 'This password must contain at least 1 number.'),
- ([create_validator_config('common.djangoapps.util.password_policy_validators.NumericValidator', {'min_numeric': 4})], # lint-amnesty, pylint: disable=line-too-long
+ ([create_validator_config('common.djangoapps.util.password_policy_validators.NumericValidator', {'min_numeric': 4})], # noqa: E501
'test123', 'This password must contain at least 4 numbers.'),
- ([create_validator_config('common.djangoapps.util.password_policy_validators.NumericValidator', {'min_numeric': 2})], # lint-amnesty, pylint: disable=line-too-long
+ ([create_validator_config('common.djangoapps.util.password_policy_validators.NumericValidator', {'min_numeric': 2})], # noqa: E501
'password123', None),
)
@unpack
@@ -202,13 +202,13 @@ def test_numeric_validation_errors(self, config, password, msg):
self.validation_errors_checker(password, msg)
@data(
- ([create_validator_config('common.djangoapps.util.password_policy_validators.UppercaseValidator', {'min_upper': 1})], # lint-amnesty, pylint: disable=line-too-long
+ ([create_validator_config('common.djangoapps.util.password_policy_validators.UppercaseValidator', {'min_upper': 1})], # noqa: E501
'lowercase', 'This password must contain at least 1 uppercase letter.'),
- ([create_validator_config('common.djangoapps.util.password_policy_validators.UppercaseValidator', {'min_upper': 6})], # lint-amnesty, pylint: disable=line-too-long
+ ([create_validator_config('common.djangoapps.util.password_policy_validators.UppercaseValidator', {'min_upper': 6})], # noqa: E501
'NOTenough', 'This password must contain at least 6 uppercase letters.'),
- ([create_validator_config('common.djangoapps.util.password_policy_validators.UppercaseValidator', {'min_upper': 1})], # lint-amnesty, pylint: disable=line-too-long
+ ([create_validator_config('common.djangoapps.util.password_policy_validators.UppercaseValidator', {'min_upper': 1})], # noqa: E501
'camelCase', None),
)
@unpack
@@ -218,13 +218,13 @@ def test_upper_case_validation_errors(self, config, password, msg):
self.validation_errors_checker(password, msg)
@data(
- ([create_validator_config('common.djangoapps.util.password_policy_validators.LowercaseValidator', {'min_lower': 1})], # lint-amnesty, pylint: disable=line-too-long
+ ([create_validator_config('common.djangoapps.util.password_policy_validators.LowercaseValidator', {'min_lower': 1})], # noqa: E501
'UPPERCASE', 'This password must contain at least 1 lowercase letter.'),
- ([create_validator_config('common.djangoapps.util.password_policy_validators.LowercaseValidator', {'min_lower': 4})], # lint-amnesty, pylint: disable=line-too-long
+ ([create_validator_config('common.djangoapps.util.password_policy_validators.LowercaseValidator', {'min_lower': 4})], # noqa: E501
'notENOUGH', 'This password must contain at least 4 lowercase letters.'),
- ([create_validator_config('common.djangoapps.util.password_policy_validators.LowercaseValidator', {'min_lower': 1})], # lint-amnesty, pylint: disable=line-too-long
+ ([create_validator_config('common.djangoapps.util.password_policy_validators.LowercaseValidator', {'min_lower': 1})], # noqa: E501
'goodPassword', None),
)
@unpack
@@ -234,13 +234,13 @@ def test_lower_case_validation_errors(self, config, password, msg):
self.validation_errors_checker(password, msg)
@data(
- ([create_validator_config('common.djangoapps.util.password_policy_validators.PunctuationValidator', {'min_punctuation': 1})], # lint-amnesty, pylint: disable=line-too-long
+ ([create_validator_config('common.djangoapps.util.password_policy_validators.PunctuationValidator', {'min_punctuation': 1})], # noqa: E501
'no punctuation', 'This password must contain at least 1 punctuation mark.'),
- ([create_validator_config('common.djangoapps.util.password_policy_validators.PunctuationValidator', {'min_punctuation': 7})], # lint-amnesty, pylint: disable=line-too-long
+ ([create_validator_config('common.djangoapps.util.password_policy_validators.PunctuationValidator', {'min_punctuation': 7})], # noqa: E501
'p@$$w0rd$!', 'This password must contain at least 7 punctuation marks.'),
- ([create_validator_config('common.djangoapps.util.password_policy_validators.PunctuationValidator', {'min_punctuation': 3})], # lint-amnesty, pylint: disable=line-too-long
+ ([create_validator_config('common.djangoapps.util.password_policy_validators.PunctuationValidator', {'min_punctuation': 3})], # noqa: E501
'excl@m@t!on', None),
)
@unpack
@@ -250,13 +250,13 @@ def test_punctuation_validation_errors(self, config, password, msg):
self.validation_errors_checker(password, msg)
@data(
- ([create_validator_config('common.djangoapps.util.password_policy_validators.SymbolValidator', {'min_symbol': 1})], # lint-amnesty, pylint: disable=line-too-long
+ ([create_validator_config('common.djangoapps.util.password_policy_validators.SymbolValidator', {'min_symbol': 1})], # noqa: E501
'no symbol', 'This password must contain at least 1 symbol.'),
- ([create_validator_config('common.djangoapps.util.password_policy_validators.SymbolValidator', {'min_symbol': 3})], # lint-amnesty, pylint: disable=line-too-long
+ ([create_validator_config('common.djangoapps.util.password_policy_validators.SymbolValidator', {'min_symbol': 3})], # noqa: E501
'☹️boo☹️', 'This password must contain at least 3 symbols.'),
- ([create_validator_config('common.djangoapps.util.password_policy_validators.SymbolValidator', {'min_symbol': 2})], # lint-amnesty, pylint: disable=line-too-long
+ ([create_validator_config('common.djangoapps.util.password_policy_validators.SymbolValidator', {'min_symbol': 2})], # noqa: E501
'☪symbols!☹️', None),
)
@unpack
diff --git a/common/djangoapps/util/tests/test_sandboxing.py b/common/djangoapps/util/tests/test_sandboxing.py
index 8bc3cc7f9349..c73f55fbabb3 100644
--- a/common/djangoapps/util/tests/test_sandboxing.py
+++ b/common/djangoapps/util/tests/test_sandboxing.py
@@ -37,8 +37,8 @@ def test_sandbox_inclusion(self):
def test_courselikes_with_unsafe_code_default(self):
"""
- Test that the default setting for COURSES_WITH_UNSAFE_CODE is an empty setting, e.g. we don't use @override_settings in these tests # lint-amnesty, pylint: disable=line-too-long
- """
+ Test that the default setting for COURSES_WITH_UNSAFE_CODE is an empty setting, e.g. we don't use @override_settings in these tests
+ """ # noqa: E501
assert not can_execute_unsafe_code(CourseLocator('edX', 'full', '2012_Fall'))
assert not can_execute_unsafe_code(CourseLocator('edX', 'full', '2013_Spring'))
assert not can_execute_unsafe_code(LibraryLocator('edX', 'test_bank'))
diff --git a/common/djangoapps/util/views.py b/common/djangoapps/util/views.py
index e4dbaabe7fac..f1f6e623e6b3 100644
--- a/common/djangoapps/util/views.py
+++ b/common/djangoapps/util/views.py
@@ -159,12 +159,12 @@ def calculate(request):
equation = request.GET['equation']
try:
result = calc.evaluator({}, {}, equation)
- except: # lint-amnesty, pylint: disable=bare-except
+ except: # noqa: E722
event = {'error': list(map(str, sys.exc_info())),
'equation': equation}
track_views.server_track(request, 'error:calc', event, page='calc')
- return HttpResponse(json.dumps({'result': 'Invalid syntax'})) # lint-amnesty, pylint: disable=http-response-with-json-dumps
- return HttpResponse(json.dumps({'result': str(result)})) # lint-amnesty, pylint: disable=http-response-with-json-dumps
+ return HttpResponse(json.dumps({'result': 'Invalid syntax'})) # pylint: disable=http-response-with-json-dumps
+ return HttpResponse(json.dumps({'result': str(result)})) # pylint: disable=http-response-with-json-dumps
def add_p3p_header(view_func):
diff --git a/common/djangoapps/xblock_django/admin.py b/common/djangoapps/xblock_django/admin.py
index a385d0d53518..76cdb1594dc5 100644
--- a/common/djangoapps/xblock_django/admin.py
+++ b/common/djangoapps/xblock_django/admin.py
@@ -7,7 +7,7 @@
from django.contrib import admin
from django.utils.translation import gettext_lazy as _
-from common.djangoapps.xblock_django.models import ( # lint-amnesty, pylint: disable=line-too-long
+from common.djangoapps.xblock_django.models import (
XBlockConfiguration,
XBlockStudioConfiguration,
XBlockStudioConfigurationFlag,
diff --git a/common/djangoapps/xblock_django/tests/test_api.py b/common/djangoapps/xblock_django/tests/test_api.py
index 72155895210b..ec22577ac827 100644
--- a/common/djangoapps/xblock_django/tests/test_api.py
+++ b/common/djangoapps/xblock_django/tests/test_api.py
@@ -2,7 +2,7 @@
Tests related to XBlock support API.
"""
from common.djangoapps.xblock_django.api import authorable_xblocks, deprecated_xblocks, disabled_xblocks
-from common.djangoapps.xblock_django.models import ( # lint-amnesty, pylint: disable=line-too-long
+from common.djangoapps.xblock_django.models import (
XBlockConfiguration,
XBlockStudioConfiguration,
XBlockStudioConfigurationFlag,
diff --git a/lms/djangoapps/branding/models.py b/lms/djangoapps/branding/models.py
index cc272c46a6cd..e3c34857decb 100644
--- a/lms/djangoapps/branding/models.py
+++ b/lms/djangoapps/branding/models.py
@@ -43,7 +43,7 @@ def clean(self):
try:
json.loads(self.configuration)
except ValueError:
- raise ValidationError('Must be valid JSON string.') # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904
+ raise ValidationError('Must be valid JSON string.') # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904, E501
@classmethod
def get_config(cls):
diff --git a/lms/djangoapps/branding/tests/test_api.py b/lms/djangoapps/branding/tests/test_api.py
index 71819a98d940..7d10491d6ecf 100644
--- a/lms/djangoapps/branding/tests/test_api.py
+++ b/lms/djangoapps/branding/tests/test_api.py
@@ -127,7 +127,6 @@ def test_get_footer(self):
],
'connect_links': [
{'url': 'https://edx.org/edx-blog', 'name': 'blog', 'title': 'Blog'},
- # pylint: disable=line-too-long
{'url': f'{settings.LMS_ROOT_URL}/support/contact_us', 'name': 'contact', 'title': 'Contact Us'},
{'url': 'https://example.support.edx.org/hc/en-us', 'name': 'help-center', 'title': 'Help Center'},
{'url': 'https://edx.org/media-kit', 'name': 'media_kit', 'title': 'Media Kit'},
@@ -182,8 +181,8 @@ def test_get_footer_disabled_contact_form(self):
Test retrieving the footer with disabled contact form.
"""
actual_footer = get_footer(is_secure=True)
- assert any((l['name'] == 'contact') for l in actual_footer['connect_links']) is False
- assert any((l['name'] == 'contact') for l in actual_footer['navigation_links']) is False
+ assert any((link['name'] == 'contact') for link in actual_footer['connect_links']) is False
+ assert any((link['name'] == 'contact') for link in actual_footer['navigation_links']) is False
@with_site_configuration(configuration=test_config_custom_url_contact_us)
def test_get_footer_custom_contact_url(self):
@@ -191,8 +190,8 @@ def test_get_footer_custom_contact_url(self):
Test retrieving the footer with custom contact form url.
"""
actual_footer = get_footer(is_secure=True)
- contact_us_link = [l for l in actual_footer['connect_links'] if l['name'] == 'contact'][0]
+ contact_us_link = [link for link in actual_footer['connect_links'] if link['name'] == 'contact'][0]
assert contact_us_link['url'] == test_config_custom_url_contact_us['CONTACT_US_CUSTOM_LINK']
- navigation_link_contact_us = [l for l in actual_footer['navigation_links'] if l['name'] == 'contact'][0]
+ navigation_link_contact_us = [link for link in actual_footer['navigation_links'] if link['name'] == 'contact'][0] # noqa: E501
assert navigation_link_contact_us['url'] == test_config_custom_url_contact_us['CONTACT_US_CUSTOM_LINK']
diff --git a/lms/djangoapps/branding/views.py b/lms/djangoapps/branding/views.py
index f92c47e5b6c8..19842d4ae504 100644
--- a/lms/djangoapps/branding/views.py
+++ b/lms/djangoapps/branding/views.py
@@ -317,7 +317,7 @@ def footer(request):
with translation.override(language):
footer_dict = branding_api.get_footer(is_secure=request.is_secure())
cache.set(cache_key, footer_dict, settings.FOOTER_CACHE_TIMEOUT)
- return JsonResponse(footer_dict, 200, content_type="application/json; charset=utf-8") # lint-amnesty, pylint: disable=redundant-content-type-for-json-response
+ return JsonResponse(footer_dict, 200, content_type="application/json; charset=utf-8") # pylint: disable=redundant-content-type-for-json-response
else:
return HttpResponse(status=406)
diff --git a/lms/djangoapps/bulk_email/models.py b/lms/djangoapps/bulk_email/models.py
index e5a2c5b455d7..cbddbb1d7bfd 100644
--- a/lms/djangoapps/bulk_email/models.py
+++ b/lms/djangoapps/bulk_email/models.py
@@ -139,7 +139,7 @@ def get_users(self, course_id, user_id=None):
enrollment_qset.exclude(id__in=staff_instructor_qset)
)
elif self.target_type == SEND_TO_COHORT:
- return self.cohorttarget.cohort.users.filter(id__in=enrollment_qset) # lint-amnesty, pylint: disable=no-member
+ return self.cohorttarget.cohort.users.filter(id__in=enrollment_qset) # pylint: disable=no-member
elif self.target_type == SEND_TO_TRACK:
return use_read_replica_if_available(
User.objects.filter(
diff --git a/lms/djangoapps/bulk_email/policies.py b/lms/djangoapps/bulk_email/policies.py
index c108f416db95..218d3ad42c86 100644
--- a/lms/djangoapps/bulk_email/policies.py
+++ b/lms/djangoapps/bulk_email/policies.py
@@ -15,9 +15,8 @@ def check(self, message):
if not course_ids:
return PolicyResult(deny=frozenset())
- # pylint: disable=line-too-long
course_keys = [CourseKey.from_string(course_id) for course_id in course_ids]
- if Optout.objects.filter(user_id=message.recipient.lms_user_id, course_id__in=course_keys).count() == len(course_keys):
+ if Optout.objects.filter(user_id=message.recipient.lms_user_id, course_id__in=course_keys).count() == len(course_keys): # noqa: E501
return PolicyResult(deny={ChannelType.EMAIL})
return PolicyResult(deny=frozenset())
diff --git a/lms/djangoapps/bulk_email/tasks.py b/lms/djangoapps/bulk_email/tasks.py
index 72cc4278f056..1b43bcae87fa 100644
--- a/lms/djangoapps/bulk_email/tasks.py
+++ b/lms/djangoapps/bulk_email/tasks.py
@@ -138,7 +138,7 @@ def perform_delegate_email_batches(entry_id, course_id, task_input, action_name)
# code that doesn't need the entry_id.
if course_id != entry.course_id:
format_msg = "Course id conflict: explicit value %r does not match task value %r"
- log.warning("Task %s: " + format_msg, task_id, course_id, entry.course_id) # lint-amnesty, pylint: disable=logging-not-lazy
+ log.warning("Task %s: " + format_msg, task_id, course_id, entry.course_id) # pylint: disable=logging-not-lazy
raise ValueError(format_msg % (course_id, entry.course_id))
# Fetch the CourseEmail.
@@ -166,7 +166,7 @@ def perform_delegate_email_batches(entry_id, course_id, task_input, action_name)
# Sanity check that course for email_obj matches that of the task referencing it.
if course_id != email_obj.course_id:
format_msg = "Course id conflict: explicit value %r does not match email value %r"
- log.warning("Task %s: " + format_msg, task_id, course_id, email_obj.course_id) # lint-amnesty, pylint: disable=logging-not-lazy
+ log.warning("Task %s: " + format_msg, task_id, course_id, email_obj.course_id) # pylint: disable=logging-not-lazy
raise ValueError(format_msg % (course_id, email_obj.course_id))
# Fetch the course object.
@@ -436,7 +436,7 @@ def format_address(course_title_no_quotes):
return from_addr
-def _send_course_email(entry_id, email_id, to_list, global_email_context, subtask_status): # lint-amnesty, pylint: disable=too-many-statements
+def _send_course_email(entry_id, email_id, to_list, global_email_context, subtask_status): # pylint: disable=too-many-statements
"""
Performs the email sending task.
@@ -602,7 +602,7 @@ def _send_course_email(entry_id, email_id, to_list, global_email_context, subtas
except SINGLE_EMAIL_FAILURE_ERRORS as exc:
# This will fall through and not retry the message.
- if exc.response['Error']['Code'] in ['MessageRejected', 'MailFromDomainNotVerified', 'MailFromDomainNotVerifiedException', 'FromEmailAddressNotVerifiedException']: # lint-amnesty, pylint: disable=line-too-long
+ if exc.response['Error']['Code'] in ['MessageRejected', 'MailFromDomainNotVerified', 'MailFromDomainNotVerifiedException', 'FromEmailAddressNotVerifiedException']: # noqa: E501
total_recipients_failed += 1
log.exception(
f"BulkEmail ==> Status: Failed(SINGLE_EMAIL_FAILURE_ERRORS), Task: {parent_task_id}, SubTask: "
@@ -648,7 +648,7 @@ def _send_course_email(entry_id, email_id, to_list, global_email_context, subtas
except INFINITE_RETRY_ERRORS as exc:
# Increment the "retried_nomax" counter, update other counters with progress to date,
# and set the state to RETRY:
- if isinstance(exc, (SMTPDataError, SMTPSenderRefused)) or exc.response['Error']['Code'] in ['LimitExceededException']: # lint-amnesty, pylint: disable=line-too-long
+ if isinstance(exc, (SMTPDataError, SMTPSenderRefused)) or exc.response['Error']['Code'] in ['LimitExceededException']: # noqa: E501
subtask_status.increment(retried_nomax=1, state=RETRY)
return _submit_for_retry(
entry_id, email_id, to_list, global_email_context, exc, subtask_status, skip_retry_max=True
diff --git a/lms/djangoapps/bulk_email/tests/test_course_optout.py b/lms/djangoapps/bulk_email/tests/test_course_optout.py
index a71b7fd832e8..b2c3627c6464 100644
--- a/lms/djangoapps/bulk_email/tests/test_course_optout.py
+++ b/lms/djangoapps/bulk_email/tests/test_course_optout.py
@@ -27,7 +27,7 @@
from xmodule.modulestore.tests.factories import CourseFactory # lint-amnesty, pylint: disable=wrong-import-order
-@patch('lms.djangoapps.bulk_email.models.html_to_text', Mock(return_value='Mocking CourseEmail.text_message', autospec=True)) # lint-amnesty, pylint: disable=line-too-long
+@patch('lms.djangoapps.bulk_email.models.html_to_text', Mock(return_value='Mocking CourseEmail.text_message', autospec=True)) # noqa: E501
# Tests for legacy views. When DEPR-38432 is picked up, these tests will require the following changes:
# Either remove or leave the specific parts that reference the legacy instructor dashboard,
# and remove the override_waffle_flag for LEGACY_INSTRUCTOR_DASHBOARD.
@@ -149,7 +149,7 @@ def test_optin_course(self):
assert self.instructor.email in sent_addresses
-@patch('lms.djangoapps.bulk_email.models.html_to_text', Mock(return_value='Mocking CourseEmail.text_message', autospec=True)) # lint-amnesty, pylint: disable=line-too-long
+@patch('lms.djangoapps.bulk_email.models.html_to_text', Mock(return_value='Mocking CourseEmail.text_message', autospec=True)) # noqa: E501
class TestACEOptoutCourseEmails(ModuleStoreTestCase):
"""
Test that optouts are referenced in sending course email.
diff --git a/lms/djangoapps/bulk_email/tests/test_email.py b/lms/djangoapps/bulk_email/tests/test_email.py
index 96ec03d5058e..12887c8eb06a 100644
--- a/lms/djangoapps/bulk_email/tests/test_email.py
+++ b/lms/djangoapps/bulk_email/tests/test_email.py
@@ -300,7 +300,7 @@ def test_esperanto_platform_arabic_course(self):
self.assertRegex(message.from_email, 'AR .* Course Staff') # noqa: PT009
-@patch('lms.djangoapps.bulk_email.models.html_to_text', Mock(return_value='Mocking CourseEmail.text_message', autospec=True)) # lint-amnesty, pylint: disable=line-too-long
+@patch('lms.djangoapps.bulk_email.models.html_to_text', Mock(return_value='Mocking CourseEmail.text_message', autospec=True)) # noqa: E501
class TestEmailSendFromDashboardMockedHtmlToText(EmailSendFromDashboardTestCase):
"""
Tests email sending with mocked html_to_text.
@@ -321,7 +321,7 @@ def test_email_disabled(self):
self.assertContains(response, "Email is not enabled for this course.", status_code=403)
@override_settings(EMAIL_USE_COURSE_ID_FROM_FOR_BULK=True)
- @patch('lms.djangoapps.bulk_email.models.html_to_text', Mock(return_value='Mocking CourseEmail.text_message', autospec=True)) # lint-amnesty, pylint: disable=line-too-long
+ @patch('lms.djangoapps.bulk_email.models.html_to_text', Mock(return_value='Mocking CourseEmail.text_message', autospec=True)) # noqa: E501
def test_send_to_self(self):
"""
Make sure email send to myself goes to myself.
@@ -360,7 +360,7 @@ def test_send_to_staff(self):
assert len(mail.outbox) == (1 + len(self.staff))
assert len([e.to[0] for e in mail.outbox]) == len([self.instructor.email] + [s.email for s in self.staff])
- @override_settings(DEFAULT_FROM_EMAIL='test@example.com', BULK_EMAIL_DEFAULT_FROM_EMAIL=None, EMAIL_USE_COURSE_ID_FROM_FOR_BULK=False) # lint-amnesty, pylint: disable=line-too-long
+ @override_settings(DEFAULT_FROM_EMAIL='test@example.com', BULK_EMAIL_DEFAULT_FROM_EMAIL=None, EMAIL_USE_COURSE_ID_FROM_FOR_BULK=False) # noqa: E501
def test_email_from_address(self):
"""
Make sure the from_address should be the DEFAULT_FROM_EMAIL when corresponding flag is enabled.
@@ -570,7 +570,7 @@ def test_unicode_students_send_to_all(self):
assert len([e.to[0] for e in mail.outbox]) ==\
len([self.instructor.email] + [s.email for s in self.staff] + [s.email for s in self.students])
- @override_settings(BULK_EMAIL_DEFAULT_FROM_EMAIL="no-reply@courseupdates.edx.org", EMAIL_USE_COURSE_ID_FROM_FOR_BULK=True) # lint-amnesty, pylint: disable=line-too-long
+ @override_settings(BULK_EMAIL_DEFAULT_FROM_EMAIL="no-reply@courseupdates.edx.org", EMAIL_USE_COURSE_ID_FROM_FOR_BULK=True) # noqa: E501
def test_long_course_display_name(self):
"""
This test tests that courses with exorbitantly large display names
diff --git a/lms/djangoapps/bulk_email/tests/test_err_handling.py b/lms/djangoapps/bulk_email/tests/test_err_handling.py
index 59614ad9db1f..d65795f07f99 100644
--- a/lms/djangoapps/bulk_email/tests/test_err_handling.py
+++ b/lms/djangoapps/bulk_email/tests/test_err_handling.py
@@ -42,7 +42,7 @@ class EmailTestException(Exception):
@ddt.ddt
-@patch('lms.djangoapps.bulk_email.models.html_to_text', Mock(return_value='Mocking CourseEmail.text_message', autospec=True)) # lint-amnesty, pylint: disable=line-too-long
+@patch('lms.djangoapps.bulk_email.models.html_to_text', Mock(return_value='Mocking CourseEmail.text_message', autospec=True)) # noqa: E501
class TestEmailErrors(ModuleStoreTestCase):
"""
Test that errors from sending email are handled properly.
@@ -208,7 +208,7 @@ def test_nonexistent_to_option(self):
"""
Tests exception when the to_option in the email doesn't exist
"""
- with self.assertRaisesRegex(ValueError, "Course email being sent to an unrecognized target: 'IDONTEXIST' *"): # noqa: PT027 # pylint: disable=line-too-long
+ with self.assertRaisesRegex(ValueError, "Course email being sent to an unrecognized target: 'IDONTEXIST' *"): # noqa: PT027
CourseEmail.create(
self.course.id,
self.instructor,
@@ -272,7 +272,7 @@ def test_send_email_undefined_subtask(self):
subtask_id = "subtask-id-value"
subtask_status = SubtaskStatus.create(subtask_id)
email_id = 1001
- with self.assertRaisesRegex(DuplicateTaskException, 'unable to find subtasks of instructor task'): # noqa: PT027 # pylint: disable=line-too-long
+ with self.assertRaisesRegex(DuplicateTaskException, 'unable to find subtasks of instructor task'): # noqa: PT027
send_course_email(entry_id, email_id, to_list, global_email_context, subtask_status.to_dict())
def test_send_email_missing_subtask(self):
@@ -286,7 +286,7 @@ def test_send_email_missing_subtask(self):
different_subtask_id = "bogus-subtask-id-value"
subtask_status = SubtaskStatus.create(different_subtask_id)
bogus_email_id = 1001
- with self.assertRaisesRegex(DuplicateTaskException, 'unable to find status for subtask of instructor task'): # noqa: PT027 # pylint: disable=line-too-long
+ with self.assertRaisesRegex(DuplicateTaskException, 'unable to find status for subtask of instructor task'): # noqa: PT027
send_course_email(entry_id, bogus_email_id, to_list, global_email_context, subtask_status.to_dict())
def test_send_email_completed_subtask(self):
diff --git a/lms/djangoapps/bulk_email/tests/test_forms.py b/lms/djangoapps/bulk_email/tests/test_forms.py
index 406ec2aeea9d..8be12a8a5a20 100644
--- a/lms/djangoapps/bulk_email/tests/test_forms.py
+++ b/lms/djangoapps/bulk_email/tests/test_forms.py
@@ -56,7 +56,7 @@ def test_repeat_course(self):
form = CourseAuthorizationAdminForm(data=form_data)
# Validation should not work because course_id field is unique
assert not form.is_valid()
- assert 'Course authorization with this Course id already exists.' == form._errors['course_id'][0] # pylint: disable=protected-access, line-too-long
+ assert 'Course authorization with this Course id already exists.' == form._errors['course_id'][0] # pylint: disable=protected-access
with self.assertRaisesRegex( # noqa: PT027
ValueError,
diff --git a/lms/djangoapps/bulk_email/tests/test_models.py b/lms/djangoapps/bulk_email/tests/test_models.py
index deacd5ca1e38..e49c948f807f 100644
--- a/lms/djangoapps/bulk_email/tests/test_models.py
+++ b/lms/djangoapps/bulk_email/tests/test_models.py
@@ -40,7 +40,7 @@
@ddt.ddt
-@patch('lms.djangoapps.bulk_email.models.html_to_text', Mock(return_value='Mocking CourseEmail.text_message', autospec=True)) # lint-amnesty, pylint: disable=line-too-long
+@patch('lms.djangoapps.bulk_email.models.html_to_text', Mock(return_value='Mocking CourseEmail.text_message', autospec=True)) # noqa: E501
class CourseEmailTest(ModuleStoreTestCase):
"""Test the CourseEmail model."""
diff --git a/lms/djangoapps/bulk_email/tests/test_signals.py b/lms/djangoapps/bulk_email/tests/test_signals.py
index abb299ad30f0..27c19e275121 100644
--- a/lms/djangoapps/bulk_email/tests/test_signals.py
+++ b/lms/djangoapps/bulk_email/tests/test_signals.py
@@ -23,7 +23,7 @@
from xmodule.modulestore.tests.factories import CourseFactory # lint-amnesty, pylint: disable=wrong-import-order
-@patch('lms.djangoapps.bulk_email.models.html_to_text', Mock(return_value='Mocking CourseEmail.text_message', autospec=True)) # lint-amnesty, pylint: disable=line-too-long
+@patch('lms.djangoapps.bulk_email.models.html_to_text', Mock(return_value='Mocking CourseEmail.text_message', autospec=True)) # noqa: E501
# Tests for legacy views. When DEPR-38432 is picked up, these tests will require the following changes:
# Either remove or leave the specific parts that reference the legacy instructor dashboard,
# and remove the override_waffle_flag for LEGACY_INSTRUCTOR_DASHBOARD.
diff --git a/lms/djangoapps/bulk_email/tests/test_tasks.py b/lms/djangoapps/bulk_email/tests/test_tasks.py
index 2610cc32d6f8..3f6a98d48b70 100644
--- a/lms/djangoapps/bulk_email/tests/test_tasks.py
+++ b/lms/djangoapps/bulk_email/tests/test_tasks.py
@@ -73,7 +73,7 @@ def my_update_subtask_status(entry_id, current_task_id, new_subtask_status):
update_subtask_status(entry_id, current_task_id, new_subtask_status)
-@patch('lms.djangoapps.bulk_email.models.html_to_text', Mock(return_value='Mocking CourseEmail.text_message', autospec=True)) # lint-amnesty, pylint: disable=line-too-long
+@patch('lms.djangoapps.bulk_email.models.html_to_text', Mock(return_value='Mocking CourseEmail.text_message', autospec=True)) # noqa: E501
class TestBulkEmailInstructorTask(InstructorTaskCourseTestCase):
"""Tests instructor task that send bulk email."""
diff --git a/lms/djangoapps/bulk_email/toggles.py b/lms/djangoapps/bulk_email/toggles.py
index dcb26e6b47c5..8f6a8c16153f 100644
--- a/lms/djangoapps/bulk_email/toggles.py
+++ b/lms/djangoapps/bulk_email/toggles.py
@@ -7,7 +7,7 @@
# .. toggle_name: bulk_email.EMAIL_USE_COURSE_ID_FROM_FOR_BULK
# .. toggle_implementation: DjangoSetting
# .. toggle_default: False
-# .. toggle_description: If False, use the same BULK_EMAIL_DEFAULT_FROM_EMAIL or DEFAULT_FROM_EMAIL as the from_addr for all bulk email, to avoid issues with spam filtering
+# .. toggle_description: If False, use the same BULK_EMAIL_DEFAULT_FROM_EMAIL or DEFAULT_FROM_EMAIL as the from_addr for all bulk email, to avoid issues with spam filtering # noqa: E501
# .. toggle_use_cases: open_edx
# .. toggle_creation_date: 2020-10-01
# .. toggle_tickets: OSPR-4957
diff --git a/lms/djangoapps/bulk_enroll/serializers.py b/lms/djangoapps/bulk_enroll/serializers.py
index 3a6425063eb1..6db1931d8327 100644
--- a/lms/djangoapps/bulk_enroll/serializers.py
+++ b/lms/djangoapps/bulk_enroll/serializers.py
@@ -46,7 +46,7 @@ def validate_courses(self, value):
try:
CourseKey.from_string(course)
except InvalidKeyError:
- raise serializers.ValidationError(f"Course key not valid: {course}") # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904
+ raise serializers.ValidationError(f"Course key not valid: {course}") # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904, E501
return value
def validate(self, attrs):
@@ -62,7 +62,7 @@ def validate(self, attrs):
for course_id, cohort_name in zip(attrs['courses'], attrs['cohorts']): # noqa: B905
if not is_cohort_exists(course_key=CourseKey.from_string(course_id), name=cohort_name):
- raise serializers.ValidationError("cohort {cohort_name} not found in course {course_id}.".format( # noqa: UP032 # pylint: disable=line-too-long
+ raise serializers.ValidationError("cohort {cohort_name} not found in course {course_id}.".format( # noqa: UP032
cohort_name=cohort_name, course_id=course_id)
)
diff --git a/lms/djangoapps/bulk_enroll/tests/test_views.py b/lms/djangoapps/bulk_enroll/tests/test_views.py
index 3be98144fe66..fa7b0e951d1c 100644
--- a/lms/djangoapps/bulk_enroll/tests/test_views.py
+++ b/lms/djangoapps/bulk_enroll/tests/test_views.py
@@ -14,7 +14,7 @@
from opaque_keys.edx.keys import CourseKey
from rest_framework.test import APIRequestFactory, APITestCase, force_authenticate
-from common.djangoapps.student.models import ( # lint-amnesty, pylint: disable=line-too-long
+from common.djangoapps.student.models import (
ENROLLED_TO_UNENROLLED,
UNENROLLED_TO_ENROLLED,
CourseEnrollment,
diff --git a/lms/djangoapps/bulk_user_retirement/tests/test_views.py b/lms/djangoapps/bulk_user_retirement/tests/test_views.py
index 0880d3f01b7a..c1cb56714fed 100644
--- a/lms/djangoapps/bulk_user_retirement/tests/test_views.py
+++ b/lms/djangoapps/bulk_user_retirement/tests/test_views.py
@@ -89,7 +89,7 @@ def test_retirement_for_multiple_users(self):
})
assert response.status_code == 200
- assert sorted(response.data['successful_user_retirements']) == sorted(expected_response['successful_user_retirements']) # pylint: disable=line-too-long
+ assert sorted(response.data['successful_user_retirements']) == sorted(expected_response['successful_user_retirements']) # noqa: E501
retirement_status_1 = UserRetirementStatus.objects.get(user__username=self.user3.username)
assert retirement_status_1.current_state == self.pending_state
@@ -113,7 +113,7 @@ def test_retirement_for_multiple_users_with_some_nonexisting_users(self):
})
assert response.status_code == 200
- assert sorted(response.data['successful_user_retirements']) == sorted(expected_response['successful_user_retirements']) # pylint: disable=line-too-long
+ assert sorted(response.data['successful_user_retirements']) == sorted(expected_response['successful_user_retirements']) # noqa: E501
retirement_status_1 = UserRetirementStatus.objects.get(user__username=self.user3.username)
assert retirement_status_1.current_state == self.pending_state
diff --git a/lms/djangoapps/ccx/api/v0/tests/test_views.py b/lms/djangoapps/ccx/api/v0/tests/test_views.py
index c68803247fdf..7039d632cdd1 100644
--- a/lms/djangoapps/ccx/api/v0/tests/test_views.py
+++ b/lms/djangoapps/ccx/api/v0/tests/test_views.py
@@ -677,7 +677,7 @@ def test_post_list_staff_master_course_in_ccx(self):
# Make sure the "Coach" on the parent course is "Staff" on the CCX
assert self.coach in list_staff_ccx_course
assert len(list_instructor_master_course) == len(list_instructor_ccx_course)
- for course_user, ccx_user in zip(sorted(list_instructor_master_course), sorted(list_instructor_ccx_course)): # noqa: B905 # pylint: disable=line-too-long
+ for course_user, ccx_user in zip(sorted(list_instructor_master_course), sorted(list_instructor_ccx_course)): # noqa: B905
assert course_user == ccx_user
diff --git a/lms/djangoapps/ccx/modulestore.py b/lms/djangoapps/ccx/modulestore.py
index 893ec1609f1e..1e2d17c77b44 100644
--- a/lms/djangoapps/ccx/modulestore.py
+++ b/lms/djangoapps/ccx/modulestore.py
@@ -127,7 +127,7 @@ def _get_modulestore_for_courselike(self, locator=None):
def fill_in_run(self, course_key):
"""See the docs for xmodule.modulestore.mixed.MixedModuleStore"""
- with remove_ccx(course_key) as (course_key, restore): # lint-amnesty, pylint: disable=redefined-argument-from-local
+ with remove_ccx(course_key) as (course_key, restore): # pylint: disable=redefined-argument-from-local
return restore(self._modulestore.fill_in_run(course_key))
def has_item(self, usage_key, **kwargs):
@@ -137,26 +137,26 @@ def has_item(self, usage_key, **kwargs):
def get_item(self, usage_key, depth=0, **kwargs):
"""See the docs for xmodule.modulestore.mixed.MixedModuleStore"""
- with remove_ccx(usage_key) as (usage_key, restore): # lint-amnesty, pylint: disable=redefined-argument-from-local
+ with remove_ccx(usage_key) as (usage_key, restore): # pylint: disable=redefined-argument-from-local
return restore(
self._modulestore.get_item(usage_key, depth, **kwargs)
)
def get_items(self, course_key, **kwargs):
"""See the docs for xmodule.modulestore.mixed.MixedModuleStore"""
- with remove_ccx(course_key) as (course_key, restore): # lint-amnesty, pylint: disable=redefined-argument-from-local
+ with remove_ccx(course_key) as (course_key, restore): # pylint: disable=redefined-argument-from-local
return restore(self._modulestore.get_items(course_key, **kwargs))
def get_course(self, course_key, depth=0, **kwargs):
"""See the docs for xmodule.modulestore.mixed.MixedModuleStore"""
- with remove_ccx(course_key) as (course_key, restore): # lint-amnesty, pylint: disable=redefined-argument-from-local
+ with remove_ccx(course_key) as (course_key, restore): # pylint: disable=redefined-argument-from-local
return restore(self._modulestore.get_course(
course_key, depth=depth, **kwargs
))
def has_course(self, course_id, ignore_case=False, **kwargs):
"""See the docs for xmodule.modulestore.mixed.MixedModuleStore"""
- with remove_ccx(course_id) as (course_id, restore): # lint-amnesty, pylint: disable=redefined-argument-from-local
+ with remove_ccx(course_id) as (course_id, restore): # pylint: disable=redefined-argument-from-local
return restore(self._modulestore.has_course(
course_id, ignore_case=ignore_case, **kwargs
))
@@ -177,45 +177,45 @@ def get_parent_location(self, location, **kwargs):
def get_block_original_usage(self, usage_key):
"""See the docs for xmodule.modulestore.mixed.MixedModuleStore"""
- with remove_ccx(usage_key) as (usage_key, restore): # lint-amnesty, pylint: disable=redefined-argument-from-local
+ with remove_ccx(usage_key) as (usage_key, restore): # pylint: disable=redefined-argument-from-local
orig_key, version = self._modulestore.get_block_original_usage(usage_key)
return restore(orig_key), version
def get_modulestore_type(self, course_id):
"""See the docs for xmodule.modulestore.mixed.MixedModuleStore"""
- with remove_ccx(course_id) as (course_id, restore): # lint-amnesty, pylint: disable=redefined-argument-from-local
+ with remove_ccx(course_id) as (course_id, restore): # pylint: disable=redefined-argument-from-local
return restore(self._modulestore.get_modulestore_type(course_id))
def get_orphans(self, course_key, **kwargs):
"""See the docs for xmodule.modulestore.mixed.MixedModuleStore"""
- with remove_ccx(course_key) as (course_key, restore): # lint-amnesty, pylint: disable=redefined-argument-from-local
+ with remove_ccx(course_key) as (course_key, restore): # pylint: disable=redefined-argument-from-local
return restore(self._modulestore.get_orphans(course_key, **kwargs))
def clone_course(self, source_course_id, dest_course_id, user_id, fields=None, **kwargs):
"""See the docs for xmodule.modulestore.mixed.MixedModuleStore"""
- with remove_ccx(source_course_id) as (source_course_id, _): # lint-amnesty, pylint: disable=redefined-argument-from-local
- with remove_ccx(dest_course_id) as (dest_course_id, dest_restore): # lint-amnesty, pylint: disable=redefined-argument-from-local
+ with remove_ccx(source_course_id) as (source_course_id, _): # pylint: disable=redefined-argument-from-local
+ with remove_ccx(dest_course_id) as (dest_course_id, dest_restore): # pylint: disable=redefined-argument-from-local
return dest_restore(self._modulestore.clone_course(
source_course_id, dest_course_id, user_id, fields=fields, **kwargs
))
def create_item(self, user_id, course_key, block_type, block_id=None, fields=None, **kwargs):
"""See the docs for xmodule.modulestore.mixed.MixedModuleStore"""
- with remove_ccx(course_key) as (course_key, restore): # lint-amnesty, pylint: disable=redefined-argument-from-local
+ with remove_ccx(course_key) as (course_key, restore): # pylint: disable=redefined-argument-from-local
return restore(self._modulestore.create_item(
user_id, course_key, block_type, block_id=block_id, fields=fields, **kwargs
))
def create_child(self, user_id, parent_usage_key, block_type, block_id=None, fields=None, **kwargs):
"""See the docs for xmodule.modulestore.mixed.MixedModuleStore"""
- with remove_ccx(parent_usage_key) as (parent_usage_key, restore): # lint-amnesty, pylint: disable=redefined-argument-from-local
+ with remove_ccx(parent_usage_key) as (parent_usage_key, restore): # pylint: disable=redefined-argument-from-local
return restore(self._modulestore.create_child(
user_id, parent_usage_key, block_type, block_id=block_id, fields=fields, **kwargs
))
def import_xblock(self, user_id, course_key, block_type, block_id, fields=None, runtime=None, **kwargs):
"""See the docs for xmodule.modulestore.mixed.MixedModuleStore"""
- with remove_ccx(course_key) as (course_key, restore): # lint-amnesty, pylint: disable=redefined-argument-from-local
+ with remove_ccx(course_key) as (course_key, restore): # pylint: disable=redefined-argument-from-local
return restore(self._modulestore.import_xblock(
user_id, course_key, block_type, block_id, fields=fields, runtime=runtime, **kwargs
))
@@ -250,7 +250,7 @@ def revert_to_published(self, location, user_id):
def create_xblock(self, runtime, course_key, block_type, block_id=None, fields=None, **kwargs):
"""See the docs for xmodule.modulestore.mixed.MixedModuleStore"""
- with remove_ccx(course_key) as (course_key, restore): # lint-amnesty, pylint: disable=redefined-argument-from-local
+ with remove_ccx(course_key) as (course_key, restore): # pylint: disable=redefined-argument-from-local
return restore(self._modulestore.create_xblock(
runtime, course_key, block_type, block_id=block_id, fields=fields, **kwargs
))
diff --git a/lms/djangoapps/ccx/tests/test_views.py b/lms/djangoapps/ccx/tests/test_views.py
index c2c2a35c5c23..0633f4eb6178 100644
--- a/lms/djangoapps/ccx/tests/test_views.py
+++ b/lms/djangoapps/ccx/tests/test_views.py
@@ -1070,7 +1070,7 @@ def test_student_progress(self):
get_course.return_value = self.course
self.addCleanup(patch_context.stop)
- self.client.login(username=self.student.username, password=self.TEST_PASSWORD) # lint-amnesty, pylint: disable=no-member
+ self.client.login(username=self.student.username, password=self.TEST_PASSWORD) # pylint: disable=no-member
url = reverse(
'progress',
kwargs={'course_id': self.ccx_key}
diff --git a/lms/djangoapps/ccx/utils.py b/lms/djangoapps/ccx/utils.py
index 36ce0c82e2b0..015687285005 100644
--- a/lms/djangoapps/ccx/utils.py
+++ b/lms/djangoapps/ccx/utils.py
@@ -225,7 +225,7 @@ def get_valid_student_with_email(identifier):
try:
validate_email(email)
except ValidationError:
- raise CCXUserValidationException(f'Could not find a user with name or email "{identifier}" ') # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904
+ raise CCXUserValidationException(f'Could not find a user with name or email "{identifier}" ') # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904, E501
return email, user
diff --git a/lms/djangoapps/ccx/views.py b/lms/djangoapps/ccx/views.py
index 8cfb9cb2b220..4f7b5301ae81 100644
--- a/lms/djangoapps/ccx/views.py
+++ b/lms/djangoapps/ccx/views.py
@@ -337,7 +337,7 @@ def override_fields(parent, data, graded, earliest=None, ccx_ids_to_delete=None)
for rec, response in responses:
log.info('Signal fired when course is published. Receiver: %s. Response: %s', rec, response)
- return HttpResponse( # lint-amnesty, pylint: disable=http-response-with-content-type-json, http-response-with-json-dumps
+ return HttpResponse( # pylint: disable=http-response-with-content-type-json, http-response-with-json-dumps
json.dumps({
'schedule': get_ccx_schedule(course, ccx),
'grading_policy': json.dumps(policy, indent=4)}),
@@ -452,7 +452,7 @@ def ccx_schedule(request, course, ccx=None):
schedule = get_ccx_schedule(course, ccx)
json_schedule = json.dumps(schedule, indent=4)
- return HttpResponse(json_schedule, content_type='application/json') # lint-amnesty, pylint: disable=http-response-with-content-type-json
+ return HttpResponse(json_schedule, content_type='application/json') # pylint: disable=http-response-with-content-type-json
@ensure_csrf_cookie
diff --git a/lms/djangoapps/certificates/generation_handler.py b/lms/djangoapps/certificates/generation_handler.py
index a1e843bead4d..53d8c11c2326 100644
--- a/lms/djangoapps/certificates/generation_handler.py
+++ b/lms/djangoapps/certificates/generation_handler.py
@@ -113,7 +113,7 @@ def _generate_certificate_task(user, course_key, enrollment_mode, course_grade,
try:
# .. filter_implemented_name: CertificateCreationRequested
# .. filter_type: org.openedx.learning.certificate.creation.requested.v1
- user, course_key, enrollment_mode, status, course_grade, generation_mode = CertificateCreationRequested.run_filter( # pylint: disable=line-too-long
+ user, course_key, enrollment_mode, status, course_grade, generation_mode = CertificateCreationRequested.run_filter( # noqa: E501
user=user,
course_key=course_key,
mode=enrollment_mode,
diff --git a/lms/djangoapps/certificates/models.py b/lms/djangoapps/certificates/models.py
index 541ff41d7b15..ac84a6fb8392 100644
--- a/lms/djangoapps/certificates/models.py
+++ b/lms/djangoapps/certificates/models.py
@@ -616,7 +616,7 @@ class Meta:
def __str__(self):
return "certificates %s by %s on %s for %s" % \
- ("regenerated" if self.is_regeneration else "generated", self.generated_by, self.created, self.course_id) # noqa: UP031 # pylint: disable=line-too-long
+ ("regenerated" if self.is_regeneration else "generated", self.generated_by, self.created, self.course_id) # noqa: UP031
class CertificateInvalidation(TimeStampedModel):
diff --git a/lms/djangoapps/certificates/tests/test_api.py b/lms/djangoapps/certificates/tests/test_api.py
index c2673e36703e..3039f4e4a564 100644
--- a/lms/djangoapps/certificates/tests/test_api.py
+++ b/lms/djangoapps/certificates/tests/test_api.py
@@ -694,7 +694,7 @@ def test_certificate_footer_data(self):
data = get_certificate_footer_context()
# Make sure there are not unexpected keys in dict returned by 'get_certificate_footer_context'
- self.assertCountEqual(list(data.keys()), ["company_about_url", "company_privacy_url", "company_tos_url"]) # noqa: PT009 # pylint: disable=line-too-long
+ self.assertCountEqual(list(data.keys()), ["company_about_url", "company_privacy_url", "company_tos_url"]) # noqa: PT009
assert self.configuration["urls"]["ABOUT"] in data["company_about_url"]
assert self.configuration["urls"]["PRIVACY"] in data["company_privacy_url"]
assert self.configuration["urls"]["TOS_AND_HONOR"] in data["company_tos_url"]
diff --git a/lms/djangoapps/certificates/tests/test_webview_views.py b/lms/djangoapps/certificates/tests/test_webview_views.py
index 69831716565f..a3cf132035d7 100644
--- a/lms/djangoapps/certificates/tests/test_webview_views.py
+++ b/lms/djangoapps/certificates/tests/test_webview_views.py
@@ -1636,7 +1636,7 @@ def test_certificate_asset_by_slug(self, mock_get_course_run_details):
mock_get_org_id.return_value = None
response = self.client.get(test_url)
self.assertContains(
- response, '
'
-"""
+""" # noqa: E501
from xml.etree import ElementTree
import markdown
diff --git a/lms/djangoapps/course_wiki/tests/test_access.py b/lms/djangoapps/course_wiki/tests/test_access.py
index cc6e5dd42b00..486d07c92709 100644
--- a/lms/djangoapps/course_wiki/tests/test_access.py
+++ b/lms/djangoapps/course_wiki/tests/test_access.py
@@ -23,7 +23,7 @@ def setUp(self):
self.wiki = get_or_create_root()
- self.course_math101 = CourseFactory.create(org='org', number='math101', display_name='Course') # lint-amnesty, pylint: disable=line-too-long
+ self.course_math101 = CourseFactory.create(org='org', number='math101', display_name='Course')
self.course_math101_staff = self.create_staff_for_course(self.course_math101)
wiki_math101 = self.create_urlpath(self.wiki, course_wiki_slug(self.course_math101))
@@ -31,7 +31,7 @@ def setUp(self):
wiki_math101_page_page = self.create_urlpath(wiki_math101_page, 'Grandchild')
self.wiki_math101_pages = [wiki_math101, wiki_math101_page, wiki_math101_page_page]
- self.course_math101b = CourseFactory.create(org='org', number='math101b', display_name='Course') # lint-amnesty, pylint: disable=line-too-long
+ self.course_math101b = CourseFactory.create(org='org', number='math101b', display_name='Course')
self.course_math101b_staff = self.create_staff_for_course(self.course_math101b)
wiki_math101b = self.create_urlpath(self.wiki, course_wiki_slug(self.course_math101b))
diff --git a/lms/djangoapps/course_wiki/tests/test_middleware.py b/lms/djangoapps/course_wiki/tests/test_middleware.py
index cba808ff67e5..884de72ab124 100644
--- a/lms/djangoapps/course_wiki/tests/test_middleware.py
+++ b/lms/djangoapps/course_wiki/tests/test_middleware.py
@@ -23,7 +23,7 @@ def setUp(self):
self.wiki = get_or_create_root()
self.course_math101 = CourseFactory.create(org='edx', number='math101', display_name='2014')
- self.course_math101_instructor = InstructorFactory(course_key=self.course_math101.id, username='instructor', password='secret') # lint-amnesty, pylint: disable=line-too-long
+ self.course_math101_instructor = InstructorFactory(course_key=self.course_math101.id, username='instructor', password='secret') # noqa: E501
self.wiki_math101 = URLPath.create_article(self.wiki, 'math101', title='math101')
self.client = Client()
diff --git a/lms/djangoapps/course_wiki/tests/tests.py b/lms/djangoapps/course_wiki/tests/tests.py
index 144e0636fd6e..eae20f9c27f1 100644
--- a/lms/djangoapps/course_wiki/tests/tests.py
+++ b/lms/djangoapps/course_wiki/tests/tests.py
@@ -228,4 +228,4 @@ def test_consent_required(self, mock_enterprise_customer_for_request):
(reverse('course_wiki', kwargs={'course_id': course_id}), 302),
(f'/courses/{course_id}/wiki/', 200),
):
- self.verify_consent_required(self.client, url, status_code=status_code) # lint-amnesty, pylint: disable=no-value-for-parameter
+ self.verify_consent_required(self.client, url, status_code=status_code) # pylint: disable=no-value-for-parameter
diff --git a/lms/djangoapps/course_wiki/views.py b/lms/djangoapps/course_wiki/views.py
index 955bf4e04268..e184d1882c83 100644
--- a/lms/djangoapps/course_wiki/views.py
+++ b/lms/djangoapps/course_wiki/views.py
@@ -46,7 +46,7 @@ def course_wiki_redirect(request, course_id, wiki_path=""):
log.exception("This course is improperly configured. The slug cannot be empty.")
valid_slug = False
if re.match(r'^[-\w\.]+$', course_slug) is None:
- log.exception("This course is improperly configured. The slug can only contain letters, numbers, periods or hyphens.") # lint-amnesty, pylint: disable=line-too-long
+ log.exception("This course is improperly configured. The slug can only contain letters, numbers, periods or hyphens.") # noqa: E501
valid_slug = False
if not valid_slug:
diff --git a/lms/djangoapps/courseware/access.py b/lms/djangoapps/courseware/access.py
index a99949c5fdbb..6712ac217eda 100644
--- a/lms/djangoapps/courseware/access.py
+++ b/lms/djangoapps/courseware/access.py
@@ -303,7 +303,7 @@ def _can_enroll_courselike(user, courselike):
elif cea.valid_for_user(user):
return ACCESS_GRANTED
else:
- debug("Deny: CEA was already consumed by a different user {} and can't be used again by {}".format( # noqa: UP032 # pylint: disable=line-too-long
+ debug("Deny: CEA was already consumed by a different user {} and can't be used again by {}".format( # noqa: UP032
cea.user.id,
user.id,
))
diff --git a/lms/djangoapps/courseware/block_render.py b/lms/djangoapps/courseware/block_render.py
index efb7d32e9070..02595f7ef383 100644
--- a/lms/djangoapps/courseware/block_render.py
+++ b/lms/djangoapps/courseware/block_render.py
@@ -339,7 +339,7 @@ def get_block(user, request, usage_key, field_data_cache, position=None, log_if_
log.debug("Error in get_block: ItemNotFoundError")
return None
- except: # pylint: disable=W0702
+ except: # noqa: E722
# Something has gone terribly wrong, but still not letting it turn into a 500.
log.exception("Error in get_block")
return None
@@ -806,13 +806,13 @@ def handle_xblock_callback(request, course_id, usage_id, handler, suffix=None):
try:
course_key = CourseKey.from_string(course_id)
except InvalidKeyError:
- raise Http404(f'{course_id} is not a valid course key') # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904
+ raise Http404(f'{course_id} is not a valid course key') # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904, E501
with modulestore().bulk_operations(course_key):
try:
course = modulestore().get_course(course_key)
except ItemNotFoundError:
- raise Http404(f'{course_id} does not exist in the modulestore') # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904
+ raise Http404(f'{course_id} does not exist in the modulestore') # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904, E501
return _invoke_xblock_handler(request, course_id, usage_id, handler, suffix, course=course)
diff --git a/lms/djangoapps/courseware/context_processor.py b/lms/djangoapps/courseware/context_processor.py
index ebfeadd76081..8036d90b287c 100644
--- a/lms/djangoapps/courseware/context_processor.py
+++ b/lms/djangoapps/courseware/context_processor.py
@@ -93,7 +93,7 @@ def get_user_timezone_or_last_seen_timezone_or_utc(user):
# We have seen non-printable characters (i.e. \x00) showing up in the
# user_timezone (I believe via the get_last_seen_courseware_timezone method).
# This sanitizes the user_timezone before passing it in.
- user_timezone = filter(lambda l: l in string.printable, user_timezone)
+ user_timezone = filter(lambda char: char in string.printable, user_timezone)
user_timezone = ''.join(user_timezone)
try:
return timezone(user_timezone)
diff --git a/lms/djangoapps/courseware/courses.py b/lms/djangoapps/courseware/courses.py
index c4745dd1350c..45601e73ffb8 100644
--- a/lms/djangoapps/courseware/courses.py
+++ b/lms/djangoapps/courseware/courses.py
@@ -246,7 +246,7 @@ def check_course_access_with_redirect(
request = get_current_request()
check_content_start_date_for_masquerade_user(course.id, user, request, course.start)
- access_response = check_course_access(course, user, action, check_if_enrolled, check_survey_complete, check_if_authenticated) # lint-amnesty, pylint: disable=line-too-long
+ access_response = check_course_access(course, user, action, check_if_enrolled, check_survey_complete, check_if_authenticated) # noqa: E501
if not access_response:
# StartDateError should be ignored
@@ -636,7 +636,7 @@ def get_course_blocks_completion_summary(course_key, user):
@request_cached()
-def get_course_assignments(course_key, user, include_access=False, include_without_due=False,): # lint-amnesty, pylint: disable=too-many-statements
+def get_course_assignments(course_key, user, include_access=False, include_without_due=False,): # pylint: disable=too-many-statements
"""
Returns a list of assignment (at the subsection/sequential level) due dates for the given course.
@@ -652,7 +652,7 @@ def get_course_assignments(course_key, user, include_access=False, include_witho
now = datetime.now(pytz.UTC)
assignments = []
- for section_key in block_data.get_children(course_usage_key): # lint-amnesty, pylint: disable=too-many-nested-blocks
+ for section_key in block_data.get_children(course_usage_key): # pylint: disable=too-many-nested-blocks
for subsection_key in block_data.get_children(section_key):
due = block_data.get_xblock_field(subsection_key, 'due')
graded = block_data.get_xblock_field(subsection_key, 'graded', False)
diff --git a/lms/djangoapps/courseware/date_summary.py b/lms/djangoapps/courseware/date_summary.py
index 00ca124259ce..2d7759df5751 100644
--- a/lms/djangoapps/courseware/date_summary.py
+++ b/lms/djangoapps/courseware/date_summary.py
@@ -128,7 +128,7 @@ def relative_datestring(self):
# 'absolute'. For example, 'absolute' might be "Jan 01, 2020",
# and if today were December 5th, 2020, 'relative' would be "1
# month".
- date_format = _("{relative} ago - {absolute}") if date_has_passed else _("in {relative} - {absolute}") # lint-amnesty, pylint: disable=redefined-outer-name
+ date_format = _("{relative} ago - {absolute}") if date_has_passed else _("in {relative} - {absolute}") # pylint: disable=redefined-outer-name
return date_format.format(
relative=relative_date,
absolute='{date}',
diff --git a/lms/djangoapps/courseware/field_overrides.py b/lms/djangoapps/courseware/field_overrides.py
index 60ffcafd25a5..b17c42328518 100644
--- a/lms/djangoapps/courseware/field_overrides.py
+++ b/lms/djangoapps/courseware/field_overrides.py
@@ -191,7 +191,7 @@ def _providers_for_course(cls, course):
enabled_providers = request_cache.data.get(cache_key, NOTSET)
if enabled_providers == NOTSET:
enabled_providers = tuple(
- provider_class for provider_class in cls.provider_classes if provider_class.enabled_for(course) # lint-amnesty, pylint: disable=not-an-iterable
+ provider_class for provider_class in cls.provider_classes if provider_class.enabled_for(course) # pylint: disable=not-an-iterable
)
request_cache.data[cache_key] = enabled_providers
@@ -302,7 +302,7 @@ def _providers_for_block(cls, block):
if enabled_providers is None:
enabled_providers = [
- provider_class for provider_class in cls.provider_classes if provider_class.enabled_for(block) # lint-amnesty, pylint: disable=not-an-iterable
+ provider_class for provider_class in cls.provider_classes if provider_class.enabled_for(block) # pylint: disable=not-an-iterable
]
request_cache.data[cache_key] = enabled_providers
diff --git a/lms/djangoapps/courseware/management/commands/clean_xml.py b/lms/djangoapps/courseware/management/commands/clean_xml.py
index 7cebce361205..c1fe6154703d 100644
--- a/lms/djangoapps/courseware/management/commands/clean_xml.py
+++ b/lms/djangoapps/courseware/management/commands/clean_xml.py
@@ -44,7 +44,7 @@ def export(course, export_dir):
root.write(f)
return True
- except: # lint-amnesty, pylint: disable=bare-except
+ except: # noqa: E722
print('Export failed!')
traceback.print_exc()
diff --git a/lms/djangoapps/courseware/management/commands/dump_course_structure.py b/lms/djangoapps/courseware/management/commands/dump_course_structure.py
index 22839ac9dfe1..e2edb09af07f 100644
--- a/lms/djangoapps/courseware/management/commands/dump_course_structure.py
+++ b/lms/djangoapps/courseware/management/commands/dump_course_structure.py
@@ -116,7 +116,7 @@ def is_inherited(field):
else:
return field.values != field.default
- inherited_metadata = {field.name: field.read_json(block) for field in block.fields.values() if is_inherited(field)} # lint-amnesty, pylint: disable=line-too-long
+ inherited_metadata = {field.name: field.read_json(block) for field in block.fields.values() if is_inherited(field)} # noqa: E501
destination[str(block.location)]['inherited_metadata'] = inherited_metadata
for child in block.get_children():
diff --git a/lms/djangoapps/courseware/model_data.py b/lms/djangoapps/courseware/model_data.py
index 7f7558d505e9..9b95b166e078 100644
--- a/lms/djangoapps/courseware/model_data.py
+++ b/lms/djangoapps/courseware/model_data.py
@@ -228,7 +228,7 @@ def set_many(self, kv_dict):
except DatabaseError:
log.exception("Saving field %r failed", kvs_key.field_name)
- raise KeyValueMultiSaveError(saved_fields) # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904
+ raise KeyValueMultiSaveError(saved_fields) # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904, E501
finally:
saved_fields.append(kvs_key.field_name)
@@ -841,7 +841,7 @@ def set_many(self, kv_dict):
saved_fields.extend(key.field_name for key in set_many_data)
except KeyValueMultiSaveError as exc:
log.exception('Error saving fields %r', [key.field_name for key in set_many_data])
- raise KeyValueMultiSaveError(saved_fields + exc.saved_field_names) # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904
+ raise KeyValueMultiSaveError(saved_fields + exc.saved_field_names) # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904, E501
def delete(self, key):
"""
diff --git a/lms/djangoapps/courseware/models.py b/lms/djangoapps/courseware/models.py
index 8bdad7aa3f81..32fc0b75dbd0 100644
--- a/lms/djangoapps/courseware/models.py
+++ b/lms/djangoapps/courseware/models.py
@@ -166,7 +166,7 @@ def get_state_by_params(cls, course_id, module_state_keys, student_id=None):
return module_states
@classmethod
- def save_state(cls, student, course_id, module_state_key, defaults): # lint-amnesty, pylint: disable=missing-function-docstring
+ def save_state(cls, student, course_id, module_state_key, defaults): # pylint: disable=missing-function-docstring
if not student.is_authenticated:
return
else:
@@ -284,7 +284,7 @@ class Meta:
app_label = "courseware"
get_latest_by = "created"
- student_module = models.ForeignKey(StudentModule, db_index=True, db_constraint=False, on_delete=models.CASCADE) # noqa: DJ012 # pylint: disable=line-too-long
+ student_module = models.ForeignKey(StudentModule, db_index=True, db_constraint=False, on_delete=models.CASCADE) # noqa: DJ012
def __repr__(self):
student_dict = {
diff --git a/lms/djangoapps/courseware/plugins.py b/lms/djangoapps/courseware/plugins.py
index a47e08529568..8c2c299c50dd 100644
--- a/lms/djangoapps/courseware/plugins.py
+++ b/lms/djangoapps/courseware/plugins.py
@@ -55,7 +55,7 @@ def set_enabled(cls, course_key: CourseKey, enabled: bool, user: 'User') -> bool
return enabled
@classmethod
- def get_allowed_operations(cls, course_key: CourseKey, user: Optional[User] = None) -> Dict[str, bool]: # noqa: UP006, UP045 # pylint: disable=line-too-long
+ def get_allowed_operations(cls, course_key: CourseKey, user: Optional[User] = None) -> Dict[str, bool]: # noqa: UP006, UP045
"""
Returns the allowed operations for the app.
"""
@@ -107,7 +107,7 @@ def set_enabled(cls, course_key: CourseKey, enabled: bool, user: 'User') -> bool
return enabled
@classmethod
- def get_allowed_operations(cls, course_key: CourseKey, user: Optional[User] = None) -> Dict[str, bool]: # pylint: disable=unused-argument,line-too-long # noqa: UP006, UP045
+ def get_allowed_operations(cls, course_key: CourseKey, user: Optional[User] = None) -> Dict[str, bool]: # pylint: disable=unused-argument # noqa: UP006, UP045
"""
Returns the allowed operations for the app.
"""
@@ -153,7 +153,7 @@ def set_enabled(cls, course_key: CourseKey, enabled: bool, user: 'User') -> bool
raise ValueError("The textbook app can not be enabled/disabled for a single course.")
@classmethod
- def get_allowed_operations(cls, course_key: CourseKey, user: Optional[User] = None) -> Dict[str, bool]: # noqa: UP006, UP045 # pylint: disable=line-too-long
+ def get_allowed_operations(cls, course_key: CourseKey, user: Optional[User] = None) -> Dict[str, bool]: # noqa: UP006, UP045
"""
Returns the allowed operations for the app.
"""
@@ -205,7 +205,7 @@ def set_enabled(cls, course_key: CourseKey, enabled: bool, user: 'User') -> bool
return enabled
@classmethod
- def get_allowed_operations(cls, course_key: CourseKey, user: Optional[User] = None) -> Dict[str, bool]: # noqa: UP006, UP045 # pylint: disable=line-too-long
+ def get_allowed_operations(cls, course_key: CourseKey, user: Optional[User] = None) -> Dict[str, bool]: # noqa: UP006, UP045
"""
Get allowed operations for calculator app.
"""
@@ -252,7 +252,7 @@ def set_enabled(cls, course_key: CourseKey, enabled: bool, user: 'User') -> bool
raise ValueError("Proctoring cannot be enabled/disabled via this API.")
@classmethod
- def get_allowed_operations(cls, course_key: CourseKey, user: Optional[User] = None) -> Dict[str, bool]: # noqa: UP006, UP045 # pylint: disable=line-too-long
+ def get_allowed_operations(cls, course_key: CourseKey, user: Optional[User] = None) -> Dict[str, bool]: # noqa: UP006, UP045
"""
Get allowed operations for proctoring app.
"""
@@ -299,7 +299,7 @@ def set_enabled(cls, course_key: CourseKey, enabled: bool, user: 'User') -> bool
raise ValueError("The custom pages app can not be enabled/disabled for a single course.")
@classmethod
- def get_allowed_operations(cls, course_key: CourseKey, user: Optional[User] = None) -> Dict[str, bool]: # noqa: UP006, UP045 # pylint: disable=line-too-long
+ def get_allowed_operations(cls, course_key: CourseKey, user: Optional[User] = None) -> Dict[str, bool]: # noqa: UP006, UP045
"""
Returns the allowed operations for the app.
"""
@@ -350,7 +350,7 @@ def set_enabled(cls, course_key: CourseKey, enabled: bool, user: 'User') -> bool
raise ValueError("Flexible Peer Grading cannot be enabled/disabled via this API.")
@classmethod
- def get_allowed_operations(cls, course_key: CourseKey, user: Optional[User] = None) -> Dict[str, bool]: # noqa: UP006, UP045 # pylint: disable=line-too-long
+ def get_allowed_operations(cls, course_key: CourseKey, user: Optional[User] = None) -> Dict[str, bool]: # noqa: UP006, UP045
"""
Get allowed operations for open response app.
"""
diff --git a/lms/djangoapps/courseware/tests/helpers.py b/lms/djangoapps/courseware/tests/helpers.py
index d537b9191add..a4bbd2399776 100644
--- a/lms/djangoapps/courseware/tests/helpers.py
+++ b/lms/djangoapps/courseware/tests/helpers.py
@@ -84,7 +84,7 @@ def new_descriptor_runtime(self, **kwargs):
runtime.get_block = modulestore().get_item
return runtime
- def initialize_module(self, runtime_kwargs=None, **kwargs): # lint-amnesty, pylint: disable=missing-function-docstring
+ def initialize_module(self, runtime_kwargs=None, **kwargs): # pylint: disable=missing-function-docstring
kwargs.update({
'parent_location': self.section.location,
'category': self.CATEGORY
@@ -97,7 +97,7 @@ def initialize_module(self, runtime_kwargs=None, **kwargs): # lint-amnesty, pyl
field_data = {}
field_data.update(self.MODEL_DATA)
student_data = DictFieldData(field_data)
- self.block._field_data = LmsFieldData(self.block._field_data, student_data) # lint-amnesty, pylint: disable=protected-access
+ self.block._field_data = LmsFieldData(self.block._field_data, student_data) # pylint: disable=protected-access
if runtime_kwargs is None:
runtime_kwargs = {}
@@ -197,10 +197,10 @@ def assert_request_status_code(self, status_code, url, method="GET", **kwargs):
"""
make_request = getattr(self.client, method.lower())
response = make_request(url, **kwargs)
- assert response.status_code == status_code, f'{method} request to {url} returned status code {response.status_code}, expected status code {status_code}' # pylint: disable=line-too-long
+ assert response.status_code == status_code, f'{method} request to {url} returned status code {response.status_code}, expected status code {status_code}' # noqa: E501
return response
- def assert_account_activated(self, url, method="GET", **kwargs): # lint-amnesty, pylint: disable=missing-function-docstring
+ def assert_account_activated(self, url, method="GET", **kwargs): # pylint: disable=missing-function-docstring
make_request = getattr(self.client, method.lower())
response = make_request(url, **kwargs)
message_list = list(messages.get_messages(response.wsgi_request))
@@ -434,11 +434,14 @@ def get_expiration_banner_text(user, course, language='en'): # lint-amnesty, py
formatted_upgrade_deadline = strftime_localized_html(upgrade_deadline, 'SHORT_DATE')
# ruff: disable[UP032]
- bannerText = '
Audit Access Expires {expiration_date} \
- You lose all access to this course, including your progress, on {expiration_date}.\
-
Upgrade by {upgrade_deadline} to get unlimited access to the course as long as it exists\
- on the site.
Upgrade now to retain access past\
- {expiration_date} '.format(
+ bannerText = (
+ '
Audit Access Expires {expiration_date} '
+ ' You lose all access to this course, including your progress, on {expiration_date}.'
+ '
Upgrade by {upgrade_deadline} to get unlimited access to the course as long as it exists' # noqa: E501
+ ' on the site.
'
+ 'Upgrade now to retain access past'
+ ' {expiration_date} '
+ ).format(
expiration_date=formatted_expiration_date,
upgrade_link=upgrade_link,
upgrade_deadline=formatted_upgrade_deadline
diff --git a/lms/djangoapps/courseware/tests/pacts/views.py b/lms/djangoapps/courseware/tests/pacts/views.py
index cb7f4af76bbf..e7be1e79c22c 100644
--- a/lms/djangoapps/courseware/tests/pacts/views.py
+++ b/lms/djangoapps/courseware/tests/pacts/views.py
@@ -58,8 +58,8 @@ def provider_state(request):
"""
state_setup_mapping = {
- 'sequence position data exists for course_id course-v1:edX+DemoX+Demo_Course, sequence_id block-v1:edX+DemoX+Demo_Course+type@sequential+block@basic_questions and activeUnitIndex 0': ProviderState().course_setup, # lint-amnesty, pylint: disable=line-too-long
- 'completion block data exists for course_id course-v1:edX+DemoX+Demo_Course, sequence_id block-v1:edX+DemoX+Demo_Course+type@sequential+block@basic_questions and usageId block-v1:edX+DemoX+Demo_Course+type@vertical+block@47dbd5f836544e61877a483c0b75606c': ProviderState().course_setup, # lint-amnesty, pylint: disable=line-too-long
+ 'sequence position data exists for course_id course-v1:edX+DemoX+Demo_Course, sequence_id block-v1:edX+DemoX+Demo_Course+type@sequential+block@basic_questions and activeUnitIndex 0': ProviderState().course_setup, # noqa: E501
+ 'completion block data exists for course_id course-v1:edX+DemoX+Demo_Course, sequence_id block-v1:edX+DemoX+Demo_Course+type@sequential+block@basic_questions and usageId block-v1:edX+DemoX+Demo_Course+type@vertical+block@47dbd5f836544e61877a483c0b75606c': ProviderState().course_setup, # noqa: E501
}
request_body = json.loads(request.body)
state = request_body.get('state')
diff --git a/lms/djangoapps/courseware/tests/test_about.py b/lms/djangoapps/courseware/tests/test_about.py
index 067318d797ce..35cd028621bf 100644
--- a/lms/djangoapps/courseware/tests/test_about.py
+++ b/lms/djangoapps/courseware/tests/test_about.py
@@ -217,7 +217,7 @@ def test_about_page_public_view(self, course_visibility):
with override_waffle_flag(COURSE_ENABLE_UNENROLLED_ACCESS_FLAG, active=True):
url = reverse('about_course', args=[str(self.course.id)])
resp = self.client.get(url)
- if course_visibility == COURSE_VISIBILITY_PUBLIC or course_visibility == COURSE_VISIBILITY_PUBLIC_OUTLINE: # lint-amnesty, pylint: disable=consider-using-in
+ if course_visibility == COURSE_VISIBILITY_PUBLIC or course_visibility == COURSE_VISIBILITY_PUBLIC_OUTLINE: # pylint: disable=consider-using-in
self.assertContains(resp, "View Course")
else:
self.assertContains(resp, "Enroll Now")
diff --git a/lms/djangoapps/courseware/tests/test_block_render.py b/lms/djangoapps/courseware/tests/test_block_render.py
index d7d13141ef98..2090c16e369e 100644
--- a/lms/djangoapps/courseware/tests/test_block_render.py
+++ b/lms/djangoapps/courseware/tests/test_block_render.py
@@ -532,7 +532,7 @@ def create_aside(item, block_type):
# check that block.runtime.service(block, 'field-data-unbound') is the same as the original
# _field_data, but now _field_data as been reset.
assert block.runtime.service(block, 'field-data-unbound') is original_field_data
- assert block.runtime.service(block, 'field-data-unbound') is not block._field_data # pylint: disable=protected-access, line-too-long
+ assert block.runtime.service(block, 'field-data-unbound') is not block._field_data # pylint: disable=protected-access
# now bind this block to a few other students
for user in [UserFactory(), UserFactory(), self.mock_user]:
@@ -550,10 +550,10 @@ def create_aside(item, block_type):
assert isinstance(block._field_data, LmsFieldData) # lint-amnesty, pylint: disable=no-member
# the LmsFieldData should now wrap OverrideFieldData
- assert isinstance(block._field_data._authored_data._source, OverrideFieldData) # lint-amnesty, pylint: disable=no-member, line-too-long
+ assert isinstance(block._field_data._authored_data._source, OverrideFieldData) # pylint: disable=no-member
# the OverrideFieldData should point to the date FieldData
- assert isinstance(block._field_data._authored_data._source.fallback, DateLookupFieldData) # lint-amnesty, pylint: disable=no-member, line-too-long
+ assert isinstance(block._field_data._authored_data._source.fallback, DateLookupFieldData) # pylint: disable=no-member
assert block._field_data._authored_data._source.fallback._defaults \
is block.runtime.service(block, 'field-data-unbound')
@@ -686,7 +686,7 @@ def test_too_many_files(self):
data={'file_id': (self._mock_file(), ) * (settings.MAX_FILEUPLOADS_PER_INPUT + 1)}
)
request.user = self.mock_user
- assert render.handle_xblock_callback(request, str(self.course_key), quote_slashes(str(self.location)), 'dummy_handler').content.decode('utf-8') == json.dumps({'success': (f'Submission aborted! Maximum {settings.MAX_FILEUPLOADS_PER_INPUT:d} files may be submitted at once')}, indent=2) # pylint: disable=line-too-long
+ assert render.handle_xblock_callback(request, str(self.course_key), quote_slashes(str(self.location)), 'dummy_handler').content.decode('utf-8') == json.dumps({'success': (f'Submission aborted! Maximum {settings.MAX_FILEUPLOADS_PER_INPUT:d} files may be submitted at once')}, indent=2) # noqa: E501
def test_too_large_file(self):
inputfile = self._mock_file(size=1 + settings.STUDENT_FILEUPLOAD_MAX_SIZE)
@@ -695,7 +695,7 @@ def test_too_large_file(self):
data={'file_id': inputfile}
)
request.user = self.mock_user
- assert render.handle_xblock_callback(request, str(self.course_key), quote_slashes(str(self.location)), 'dummy_handler').content.decode('utf-8') == json.dumps({'success': ('Submission aborted! Your file "%s" is too large (max size: %d MB)' % (inputfile.name, (settings.STUDENT_FILEUPLOAD_MAX_SIZE / (1000 ** 2))))}, indent=2) # pylint: disable=line-too-long # noqa: UP031
+ assert render.handle_xblock_callback(request, str(self.course_key), quote_slashes(str(self.location)), 'dummy_handler').content.decode('utf-8') == json.dumps({'success': ('Submission aborted! Your file "%s" is too large (max size: %d MB)' % (inputfile.name, (settings.STUDENT_FILEUPLOAD_MAX_SIZE / (1000 ** 2))))}, indent=2) # noqa: E501, UP031
def test_xblock_dispatch(self):
request = self.request_factory.post('dummy_url', data={'position': 1})
@@ -1068,7 +1068,7 @@ def setup_request_and_course(self, num_finds, num_sends):
with self.modulestore.bulk_operations(self.course_key):
with check_mongo_calls(num_finds, num_sends):
self.toy_course = self.store.get_course(self.course_key, depth=2) # pylint: disable=attribute-defined-outside-init
- self.field_data_cache = FieldDataCache.cache_for_block_descendents( # lint-amnesty, pylint: disable=attribute-defined-outside-init
+ self.field_data_cache = FieldDataCache.cache_for_block_descendents( # pylint: disable=attribute-defined-outside-init
self.course_key, self.request.user, self.toy_course, depth=2
)
@@ -1803,7 +1803,7 @@ def test_staff_debug_info_score_for_invalid_dropdown(self):
- """
+ """ # noqa: E501
problem_block = BlockFactory.create(
category='problem',
data=problem_xml
@@ -1933,7 +1933,7 @@ def setUp(self):
self.user = UserFactory()
@patch('lms.djangoapps.courseware.block_render.has_access', Mock(return_value=True, autospec=True))
- def _get_anonymous_id(self, course_id, xblock_class, should_get_deprecated_id: bool): # lint-amnesty, pylint: disable=missing-function-docstring
+ def _get_anonymous_id(self, course_id, xblock_class, should_get_deprecated_id: bool): # pylint: disable=missing-function-docstring
location = course_id.make_usage_key('dummy_category', 'dummy_name')
mixed_class = Mixologist(settings.XBLOCK_MIXINS).mix(xblock_class)
block = Mock(
@@ -2515,7 +2515,7 @@ def _load_block(self):
# Create a child for each user
self.children_for_user = {
- user: BlockFactory(category='xblock', parent=self.parent).scope_ids.usage_id # lint-amnesty, pylint: disable=no-member
+ user: BlockFactory(category='xblock', parent=self.parent).scope_ids.usage_id # pylint: disable=no-member
for user in self.users.values()
}
diff --git a/lms/djangoapps/courseware/tests/test_field_overrides.py b/lms/djangoapps/courseware/tests/test_field_overrides.py
index 815110ac95b4..93aae81ad043 100644
--- a/lms/djangoapps/courseware/tests/test_field_overrides.py
+++ b/lms/djangoapps/courseware/tests/test_field_overrides.py
@@ -133,7 +133,7 @@ def test_no_overrides_configured(self):
@override_settings(
MODULESTORE_FIELD_OVERRIDE_PROVIDERS=['lms.djangoapps.courseware.tests.test_field_overrides.TestOverrideProvider']
)
-class OverrideModulestoreFieldDataTests(FieldOverrideTestMixin, OverrideFieldDataTests): # lint-amnesty, pylint: disable=missing-class-docstring, test-inherits-tests
+class OverrideModulestoreFieldDataTests(FieldOverrideTestMixin, OverrideFieldDataTests): # pylint: disable=missing-class-docstring, test-inherits-tests
def make_one(self):
return OverrideModulestoreFieldData.wrap(self.course, DictFieldData({
'foo': 'bar',
diff --git a/lms/djangoapps/courseware/tests/test_i18n.py b/lms/djangoapps/courseware/tests/test_i18n.py
index e4b12539f678..156cb77db3c4 100644
--- a/lms/djangoapps/courseware/tests/test_i18n.py
+++ b/lms/djangoapps/courseware/tests/test_i18n.py
@@ -35,7 +35,7 @@ def setUp(self):
def assert_tag_has_attr(self, content, tag, attname, value):
"""Assert that a tag in `content` has a certain value in a certain attribute."""
- regex_string = r"""<{tag} [^>]*\b{attname}=['"]([\w\d\- ]+)['"][^>]*>""" # noqa: W605,E501
+ regex_string = r"""<{tag} [^>]*\b{attname}=['"]([\w\d\- ]+)['"][^>]*>"""
regex = regex_string.format(tag=tag, attname=attname)
match = re.search(regex, content)
assert match, (f"Couldn't find desired tag '{tag}' with attr '{attname}' in {content!r}")
diff --git a/lms/djangoapps/courseware/tests/test_model_data.py b/lms/djangoapps/courseware/tests/test_model_data.py
index 1aa69c436fee..8252b93ded36 100644
--- a/lms/djangoapps/courseware/tests/test_model_data.py
+++ b/lms/djangoapps/courseware/tests/test_model_data.py
@@ -41,7 +41,7 @@ def mock_field(scope, name):
return field
-def mock_block(fields=[]): # lint-amnesty, pylint: disable=dangerous-default-value, missing-function-docstring # noqa: B006
+def mock_block(fields=[]): # lint-amnesty, pylint: disable=dangerous-default-value, missing-function-docstring # noqa: B006, E501
block = Mock(entry_point=XBlock.entry_point)
block.scope_ids = ScopeIds('user1', 'mock_problem', LOCATION('def_id'), LOCATION('usage_id'))
block.module_class.fields.values.return_value = fields
@@ -160,7 +160,7 @@ def test_set_existing_field(self):
self.kvs.set(user_state_key('a_field'), 'new_value')
assert 1 == StudentModule.objects.all().count()
assert {'b_field': 'b_value', 'a_field': 'new_value'} == json.loads(StudentModule.objects.all()[0].state)
- # lint-amnesty, pylint: disable=line-too-long
+
def test_set_missing_field(self):
"Test that setting a new user_state field changes the value"
@@ -173,8 +173,8 @@ def test_set_missing_field(self):
with self.assertNumQueries(2, using='student_module_history'):
self.kvs.set(user_state_key('not_a_field'), 'new_value')
assert 1 == StudentModule.objects.all().count()
- assert {'b_field': 'b_value', 'a_field': 'a_value', 'not_a_field': 'new_value'} == json.loads(StudentModule.objects.all()[0].state)
- # lint-amnesty, pylint: disable=line-too-long
+ assert {'b_field': 'b_value', 'a_field': 'a_value', 'not_a_field': 'new_value'} == json.loads(StudentModule.objects.all()[0].state) # noqa: E501
+
def test_delete_existing_field(self):
"Test that deleting an existing field removes it from the StudentModule"
@@ -245,7 +245,7 @@ def test_set_many_failure(self):
assert exception_context.value.saved_field_names == []
-class TestMissingStudentModule(FilteredQueryCountMixin, TestCase): # lint-amnesty, pylint: disable=missing-class-docstring
+class TestMissingStudentModule(FilteredQueryCountMixin, TestCase): # pylint: disable=missing-class-docstring
# Tell Django to clean out all databases, not just default
databases = set(connections)
diff --git a/lms/djangoapps/courseware/tests/test_video_handlers.py b/lms/djangoapps/courseware/tests/test_video_handlers.py
index f9e355305dea..2d5c23397c20 100644
--- a/lms/djangoapps/courseware/tests/test_video_handlers.py
+++ b/lms/djangoapps/courseware/tests/test_video_handlers.py
@@ -100,7 +100,7 @@ def _create_file(content=''):
"""
Create temporary subs_somevalue.srt.sjson file.
"""
- sjson_file = tempfile.NamedTemporaryFile(prefix="subs_", suffix=".srt.sjson") # lint-amnesty, pylint: disable=consider-using-with
+ sjson_file = tempfile.NamedTemporaryFile(prefix="subs_", suffix=".srt.sjson") # pylint: disable=consider-using-with
sjson_file.content_type = 'application/json'
sjson_file.write(textwrap.dedent(content).encode('utf-8'))
sjson_file.seek(0)
diff --git a/lms/djangoapps/courseware/tests/test_video_mongo.py b/lms/djangoapps/courseware/tests/test_video_mongo.py
index 2b5a958e93e1..7ed9e2564c05 100644
--- a/lms/djangoapps/courseware/tests/test_video_mongo.py
+++ b/lms/djangoapps/courseware/tests/test_video_mongo.py
@@ -1482,9 +1482,8 @@ def test_val_encoding_in_context_without_external_youtube_source(self, val_video
"""
with patch('xmodule.video_block.video_block.edxval_api.get_urls_for_profiles') as get_urls_for_profiles:
get_urls_for_profiles.return_value = val_video_encodings
- # pylint: disable=line-too-long
self.initialize_block(
- data='
[] '
+ data='
[] ' # noqa: E501
)
context = self.block.get_context()
assert context['transcripts_basic_tab_metadata']['video_url']['value'] == video_url
@@ -2031,7 +2030,7 @@ def test_import_val_data_internal(self):
- """.format( # noqa: UP032
+ """.format( # noqa: E501, UP032
edx_video_id=edx_video_id,
sub_id=sub_id,
transcripts=json.dumps(external_transcripts),
@@ -2121,7 +2120,7 @@ def test_import_val_transcript(self):
- """.format( # noqa: UP032
+ """.format( # noqa: E501, UP032
edx_video_id=edx_video_id,
val_transcript_language_code=val_transcript_language_code,
val_transcript_provider=val_transcript_provider
diff --git a/lms/djangoapps/courseware/tests/test_view_authentication.py b/lms/djangoapps/courseware/tests/test_view_authentication.py
index 9a412526f276..c0399753b9a5 100644
--- a/lms/djangoapps/courseware/tests/test_view_authentication.py
+++ b/lms/djangoapps/courseware/tests/test_view_authentication.py
@@ -574,7 +574,7 @@ def test_content_beta_period(self):
Check that beta-test access works for content.
"""
# student user shouldn't see it
- assert not has_access(self.normal_student, 'load', self.content, self.course.id) # lint-amnesty, pylint: disable=no-member, line-too-long
+ assert not has_access(self.normal_student, 'load', self.content, self.course.id) # pylint: disable=no-member
# now the student should see it
- assert has_access(self.beta_tester, 'load', self.content, self.course.id) # lint-amnesty, pylint: disable=no-member, line-too-long
+ assert has_access(self.beta_tester, 'load', self.content, self.course.id) # pylint: disable=no-member
diff --git a/lms/djangoapps/courseware/tests/test_views.py b/lms/djangoapps/courseware/tests/test_views.py
index dd2d172a9d02..46503df56743 100644
--- a/lms/djangoapps/courseware/tests/test_views.py
+++ b/lms/djangoapps/courseware/tests/test_views.py
@@ -621,7 +621,7 @@ def test_submission_history_timezone(self, timezone, hour_diff):
def _email_opt_in_checkbox(self, response, org_name_string=None):
"""Check if the email opt-in checkbox appears in the response content."""
- checkbox_html = '
' # lint-amnesty, pylint: disable=line-too-long
+ checkbox_html = '
' # noqa: E501
if org_name_string:
# Verify that the email opt-in checkbox appears, and that the expected
# organization name is displayed.
@@ -748,7 +748,7 @@ def test_submit_financial_assistance_request(self, mock_create_zendesk_ticket):
assert additional_info['Certify work diligently to receive a certificate'] == 'No'
assert additional_info['Certify abide by the honor code'] == 'No'
- assert ticket_subject == f'Financial assistance request for learner {username} in course {self.course.display_name}' # pylint: disable=line-too-long
+ assert ticket_subject == f'Financial assistance request for learner {username} in course {self.course.display_name}' # noqa: E501
self.assertEqual([{'id': 'custom_123', 'value': course}], custom_fields) # noqa: PT009
assert 'Client IP' in additional_info
assert group_name == 'Financial Assistance'
@@ -1670,7 +1670,7 @@ def setUp(self):
super().setUp()
self.staff_user = UserFactory.create(is_staff=True)
- def setup_course(self, show_correctness='', due_date=None, graded=False, **course_options): # lint-amnesty, pylint: disable=arguments-differ
+ def setup_course(self, show_correctness='', due_date=None, graded=False, **course_options): # pylint: disable=arguments-differ
"""
Set up course with a subsection with the given show_correctness, due_date, and graded settings.
"""
@@ -1717,10 +1717,10 @@ def add_problem(self):
choices=[True, False],
choice_names=['choice_0', 'choice_1']
)
- self.problem = BlockFactory.create(category='problem', parent_location=self.vertical.location, # lint-amnesty, pylint: disable=attribute-defined-outside-init
+ self.problem = BlockFactory.create(category='problem', parent_location=self.vertical.location, # pylint: disable=attribute-defined-outside-init
data=problem_xml, display_name='Problem 1')
# Re-fetch the course from the database
- self.course = self.store.get_course(self.course.id) # lint-amnesty, pylint: disable=attribute-defined-outside-init
+ self.course = self.store.get_course(self.course.id) # pylint: disable=attribute-defined-outside-init
def answer_problem(self, value=1, max_value=1):
"""
@@ -1746,7 +1746,7 @@ def answer_problem(self, value=1, max_value=1):
block.runtime.publish(self.problem, 'grade', grade_dict)
def assert_progress_page_show_grades(self, response, show_correctness, due_date, graded,
- show_grades, score, max_score, avg): # lint-amnesty, pylint: disable=unused-argument
+ show_grades, score, max_score, avg): # pylint: disable=unused-argument
"""
Ensures that grades and scores are shown or not shown on the progress page as required.
"""
@@ -2753,7 +2753,7 @@ def test_is_course_open_for_learner(
request.user = staff_user
request.session = {}
if setup_enterprise_enrollment:
- course_enrollment = CourseEnrollmentFactory(mode=CourseMode.VERIFIED, user=staff_user, course_id=course.id) # noqa: F841 # pylint: disable=line-too-long
+ course_enrollment = CourseEnrollmentFactory(mode=CourseMode.VERIFIED, user=staff_user, course_id=course.id) # noqa: F841
enterprise_customer = EnterpriseCustomerFactory(enable_learner_portal=True)
add_enterprise_customer_to_session(request, EnterpriseCustomerSerializer(enterprise_customer).data)
enterprise_customer_user = EnterpriseCustomerUserFactory(
@@ -3356,6 +3356,6 @@ def test_course_about_redirect_to_mfe(self, catalog_mfe_enabled, expected_redire
response = self.client.get(reverse('about_course', args=[str(self.course.id)]))
if expected_redirect:
assert response.status_code == 301
- assert response.url == "http://example.com/catalog/courses/{}/about".format(self.course.id) # noqa: UP032 # pylint: disable=line-too-long
+ assert response.url == "http://example.com/catalog/courses/{}/about".format(self.course.id) # noqa: UP032
else:
assert response.status_code == 200
diff --git a/lms/djangoapps/courseware/toggles.py b/lms/djangoapps/courseware/toggles.py
index a14924519757..ee45fef2456a 100644
--- a/lms/djangoapps/courseware/toggles.py
+++ b/lms/djangoapps/courseware/toggles.py
@@ -144,7 +144,7 @@
# .. toggle_name: courseware.unify_site_and_translation_language
# .. toggle_implementation: WaffleFlag
# .. toggle_default: False
-# .. toggle_description: Update LMS to use site language for xpert unit translations and enable new header site language switcher.
+# .. toggle_description: Update LMS to use site language for xpert unit translations and enable new header site language switcher. # noqa: E501
# .. toggle_use_cases: opt_in
# .. toggle_creation_date: 2026-01-08
# .. toggle_target_removal_date: None
diff --git a/lms/djangoapps/courseware/user_state_client.py b/lms/djangoapps/courseware/user_state_client.py
index eac0dcaa166c..f46041b34639 100644
--- a/lms/djangoapps/courseware/user_state_client.py
+++ b/lms/djangoapps/courseware/user_state_client.py
@@ -445,7 +445,7 @@ def set_many(self, username, block_keys_to_state, scope=Scope.user_state):
# on get_or_create to be able to see rows created in another
# process. This seems to happen frequently, and ignoring it is the
# best course of action for now
- log.warning("set_many: IntegrityError for student {} - course_id {} - usage key {}".format( # noqa: UP032 # pylint: disable=line-too-long
+ log.warning("set_many: IntegrityError for student {} - course_id {} - usage key {}".format( # noqa: UP032
user, repr(str(usage_key.context_key)), usage_key
))
return
@@ -468,7 +468,7 @@ def set_many(self, username, block_keys_to_state, scope=Scope.user_state):
except IntegrityError:
# The UPDATE above failed. Log information - but ignore the error.
# See https://openedx.atlassian.net/browse/TNL-5365
- log.warning("set_many: IntegrityError for student {} - course_id {} - usage key {}".format( # noqa: UP032 # pylint: disable=line-too-long
+ log.warning("set_many: IntegrityError for student {} - course_id {} - usage key {}".format( # noqa: UP032
user, repr(str(usage_key.context_key)), usage_key
))
log.warning("set_many: All {} block keys: {}".format( # noqa: UP032
diff --git a/lms/djangoapps/courseware/views/views.py b/lms/djangoapps/courseware/views/views.py
index 89bc76b67de9..af2f07e32282 100644
--- a/lms/djangoapps/courseware/views/views.py
+++ b/lms/djangoapps/courseware/views/views.py
@@ -496,13 +496,13 @@ def get(self, request, course_id, tab_slug, **kwargs): # lint-amnesty, pylint:
return super().get(request, course=course, tab=tab, **kwargs)
- def render_to_fragment(self, request, course=None, tab=None, **kwargs): # lint-amnesty, pylint: disable=arguments-differ
+ def render_to_fragment(self, request, course=None, tab=None, **kwargs): # pylint: disable=arguments-differ
"""
Renders the static tab to a fragment.
"""
return get_static_tab_fragment(request, course, tab)
- def render_standalone_response(self, request, fragment, course=None, tab=None, **kwargs): # lint-amnesty, pylint: disable=arguments-differ
+ def render_standalone_response(self, request, fragment, course=None, tab=None, **kwargs): # pylint: disable=arguments-differ
"""
Renders this static tab's fragment to HTML for a standalone page.
"""
@@ -623,7 +623,7 @@ def handle_exceptions(request, course_key, course, exception):
"""
Handle exceptions raised when rendering a view.
"""
- if isinstance(exception, Redirect) or isinstance(exception, Http404): # lint-amnesty, pylint: disable=consider-merging-isinstance
+ if isinstance(exception, Redirect) or isinstance(exception, Http404): # pylint: disable=consider-merging-isinstance
raise # lint-amnesty, pylint: disable=misplaced-bare-raise
if settings.DEBUG:
raise # lint-amnesty, pylint: disable=misplaced-bare-raise
@@ -689,14 +689,14 @@ def create_page_context(self, request, course=None, tab=None, **kwargs):
)
return context
- def render_to_fragment(self, request, course=None, page_context=None, **kwargs): # lint-amnesty, pylint: disable=arguments-differ
+ def render_to_fragment(self, request, course=None, page_context=None, **kwargs): # pylint: disable=arguments-differ
"""
Renders the course tab to a fragment.
"""
tab = page_context['tab']
return tab.render_to_fragment(request, course, **kwargs)
- def render_standalone_response(self, request, fragment, course=None, tab=None, page_context=None, **kwargs): # lint-amnesty, pylint: disable=arguments-differ
+ def render_standalone_response(self, request, fragment, course=None, tab=None, page_context=None, **kwargs): # pylint: disable=arguments-differ
"""
Renders this course tab's fragment to HTML for a standalone page.
"""
@@ -1075,7 +1075,7 @@ def _progress(request, course_key, student_id):
return response
-def _downloadable_certificate_message(course, cert_downloadable_status): # lint-amnesty, pylint: disable=missing-function-docstring
+def _downloadable_certificate_message(course, cert_downloadable_status): # pylint: disable=missing-function-docstring
if certs_api.has_html_certificates_enabled(course):
if certs_api.get_active_web_certificate(course) is not None:
return _downloadable_cert_data(
@@ -1388,7 +1388,7 @@ def get_course_lti_endpoints(request, course_id):
for block in lti_noauth_blocks
]
- return HttpResponse(json.dumps(endpoints), content_type='application/json') # lint-amnesty, pylint: disable=http-response-with-content-type-json, http-response-with-json-dumps
+ return HttpResponse(json.dumps(endpoints), content_type='application/json') # pylint: disable=http-response-with-content-type-json, http-response-with-json-dumps
@login_required
@@ -1556,7 +1556,7 @@ def _check_sequence_exam_access(request, location):
# unpack will validate both expiration and the requesting user matches the
# token user
exam_access_unpacked = unpack_jwt(exam_access_token, request.user.id)
- except: # pylint: disable=bare-except
+ except: # noqa: E722
log.exception(f"Failed to validate exam access token. user_id={request.user.id} location={location}")
return False
@@ -1593,7 +1593,7 @@ def render_xblock(request, usage_key_string, check_if_enrolled=True, disable_sta
set_custom_attribute('block_extracted', is_extracted)
requested_view = request.GET.get('view', 'student_view')
- if requested_view != 'student_view' and requested_view != 'public_view': # lint-amnesty, pylint: disable=consider-using-in
+ if requested_view != 'student_view' and requested_view != 'public_view': # pylint: disable=consider-using-in
return HttpResponseBadRequest(
f"Rendering of the xblock view '{nh3.clean(requested_view)}' is not supported."
)
diff --git a/lms/djangoapps/discussion/django_comment_client/base/views.py b/lms/djangoapps/discussion/django_comment_client/base/views.py
index 69feeba891f1..efc33f63a1df 100644
--- a/lms/djangoapps/discussion/django_comment_client/base/views.py
+++ b/lms/djangoapps/discussion/django_comment_client/base/views.py
@@ -1036,7 +1036,7 @@ def un_pin_thread(request, course_id, thread_id):
@require_POST
@login_required
@permitted
-def follow_thread(request, course_id, thread_id): # lint-amnesty, pylint: disable=missing-function-docstring, unused-argument
+def follow_thread(request, course_id, thread_id): # pylint: disable=missing-function-docstring, unused-argument
user = cc.User.from_django_user(request.user)
course_key = CourseKey.from_string(course_id)
course = get_course_by_id(course_key)
@@ -1101,7 +1101,7 @@ def unfollow_commentable(request, course_id, commentable_id): # lint-amnesty, p
@login_required
@csrf.csrf_exempt
@xframe_options_exempt
-def upload(request, course_id): # ajax upload file to a question or answer # lint-amnesty, pylint: disable=unused-argument
+def upload(request, course_id): # ajax upload file to a question or answer # pylint: disable=unused-argument # noqa: E501
"""view that handles file upload via Ajax
"""
diff --git a/lms/djangoapps/discussion/django_comment_client/tests/group_id.py b/lms/djangoapps/discussion/django_comment_client/tests/group_id.py
index 1de062d2b210..2f2d392208a0 100644
--- a/lms/djangoapps/discussion/django_comment_client/tests/group_id.py
+++ b/lms/djangoapps/discussion/django_comment_client/tests/group_id.py
@@ -122,7 +122,7 @@ def test_cohorted_topic_moderator_with_other_group_id(self, mock_request):
def test_cohorted_topic_moderator_with_invalid_group_id(self, mock_request):
invalid_id = self.student_cohort.id + self.moderator_cohort.id
- response = self.call_view(mock_request, "cohorted_topic", self.moderator, invalid_id) # lint-amnesty, pylint: disable=assignment-from-no-return
+ response = self.call_view(mock_request, "cohorted_topic", self.moderator, invalid_id) # pylint: disable=assignment-from-no-return
assert response.status_code == 500
def test_cohorted_topic_enrollment_track_invalid_group_id(self, mock_request):
@@ -136,7 +136,7 @@ def test_cohorted_topic_enrollment_track_invalid_group_id(self, mock_request):
})
invalid_id = -1000
- response = self.call_view(mock_request, "cohorted_topic", self.moderator, invalid_id) # lint-amnesty, pylint: disable=assignment-from-no-return
+ response = self.call_view(mock_request, "cohorted_topic", self.moderator, invalid_id) # pylint: disable=assignment-from-no-return
assert response.status_code == 500
@@ -346,7 +346,7 @@ def test_cohorted_topic_moderator_with_other_group_id(self):
def test_cohorted_topic_moderator_with_invalid_group_id(self):
invalid_id = self.student_cohort.id + self.moderator_cohort.id
- response = self.call_view("cohorted_topic", self.moderator, invalid_id) # lint-amnesty, pylint: disable=assignment-from-no-return
+ response = self.call_view("cohorted_topic", self.moderator, invalid_id) # pylint: disable=assignment-from-no-return
assert response.status_code == 500
def test_cohorted_topic_enrollment_track_invalid_group_id(self):
@@ -360,7 +360,7 @@ def test_cohorted_topic_enrollment_track_invalid_group_id(self):
})
invalid_id = -1000
- response = self.call_view("cohorted_topic", self.moderator, invalid_id) # lint-amnesty, pylint: disable=assignment-from-no-return
+ response = self.call_view("cohorted_topic", self.moderator, invalid_id) # pylint: disable=assignment-from-no-return
assert response.status_code == 500
diff --git a/lms/djangoapps/discussion/django_comment_client/tests/mock_cs_server/test_mock_cs_server.py b/lms/djangoapps/discussion/django_comment_client/tests/mock_cs_server/test_mock_cs_server.py
index c228cfc502f3..6d3f0903ab2d 100644
--- a/lms/djangoapps/discussion/django_comment_client/tests/mock_cs_server/test_mock_cs_server.py
+++ b/lms/djangoapps/discussion/django_comment_client/tests/mock_cs_server/test_mock_cs_server.py
@@ -48,10 +48,10 @@ def test_new_user_request(self):
'external_id': '4', 'email': 'user100@edx.org'}
data = json.dumps(values)
headers = {'Content-Type': 'application/json', 'Content-Length': len(data), 'X-Edx-Api-Key': 'TEST_API_KEY'}
- req = six.moves.urllib.request.Request(self.server_url + '/api/v1/users/4', data, headers) # lint-amnesty, pylint: disable=undefined-variable # noqa: F821
+ req = six.moves.urllib.request.Request(self.server_url + '/api/v1/users/4', data, headers) # pylint: disable=undefined-variable # noqa: F821
# Send the request to the mock cs server
- response = six.moves.urllib.request.urlopen(req) # lint-amnesty, pylint: disable=undefined-variable # noqa: F821
+ response = six.moves.urllib.request.urlopen(req) # pylint: disable=undefined-variable # noqa: F821
# Receive the reply from the mock cs server
response_dict = json.loads(response.read())
diff --git a/lms/djangoapps/discussion/django_comment_client/tests/test_utils.py b/lms/djangoapps/discussion/django_comment_client/tests/test_utils.py
index ebcc750281b3..7bb163babc8a 100644
--- a/lms/djangoapps/discussion/django_comment_client/tests/test_utils.py
+++ b/lms/djangoapps/discussion/django_comment_client/tests/test_utils.py
@@ -1266,7 +1266,7 @@ def to_id(name):
assert not utils.is_commentable_divided(course.id, to_id(
'random')), 'Non-top-level discussion is not cohorted if always_divide_inline_discussions is False.'
assert utils.is_commentable_divided(course.id, to_id(
- 'random_inline')), 'If always_divide_inline_discussions set to False, Non-top-level discussion is cohorted if explicitly set in cohorted_discussions.'
+ 'random_inline')), 'If always_divide_inline_discussions set to False, Non-top-level discussion is cohorted if explicitly set in cohorted_discussions.' # noqa: E501
assert utils.is_commentable_divided(course.id, to_id(
'Feedback')), 'If always_divide_inline_discussions set to False, top-level discussion are not affected.'
@@ -1779,6 +1779,5 @@ def test_convert_html_to_markdown(self):
"""
input_text = '
Example Paragraph text
' \
'
'
- # pylint: disable=line-too-long
- expected_output = '[Example](https://example.com)\n\nParagraph text\n\n '
+ expected_output = '[Example](https://example.com)\n\nParagraph text\n\n ' # noqa: E501
self.assertEqual(utils.convert_html_to_markdown(input_text), expected_output) # noqa: PT009
diff --git a/lms/djangoapps/discussion/django_comment_client/utils.py b/lms/djangoapps/discussion/django_comment_client/utils.py
index 797d0b127043..113bffc4c94a 100644
--- a/lms/djangoapps/discussion/django_comment_client/utils.py
+++ b/lms/djangoapps/discussion/django_comment_client/utils.py
@@ -192,7 +192,7 @@ def get_discussion_id_map_entry(xblock):
xblock.discussion_id,
{
"location": xblock.location,
- "title": xblock.discussion_category.split("/")[-1].strip() + (" / " + xblock.discussion_target if xblock.discussion_target else "")
+ "title": xblock.discussion_category.split("/")[-1].strip() + (" / " + xblock.discussion_target if xblock.discussion_target else "") # noqa: E501
}
)
@@ -1086,8 +1086,7 @@ def replace_image(match):
return f"![{alt_text}]({url} \"{title}\")"
# Use a regular expression to match each
tag and call replace_image on each match
- # pylint: disable=line-too-long
- regex_exp = r'
]+)? src="([^"]+)"(?: [^>]+)?(?: alt="([^"]+)")?(?: [^>]+)?(?: title="([^"]+)")?(?: [^>]+)?/>'
+ regex_exp = r']+)? src="([^"]+)"(?: [^>]+)?(?: alt="([^"]+)")?(?: [^>]+)?(?: title="([^"]+)")?(?: [^>]+)?/>' # noqa: E501
return re.sub(regex_exp, replace_image, text)
diff --git a/lms/djangoapps/discussion/notification_prefs/views.py b/lms/djangoapps/discussion/notification_prefs/views.py
index 493a43781381..f066d83d32e5 100644
--- a/lms/djangoapps/discussion/notification_prefs/views.py
+++ b/lms/djangoapps/discussion/notification_prefs/views.py
@@ -73,7 +73,7 @@ def decrypt(token): # lint-amnesty, pylint: disable=missing-function-docstring
try:
base64_decoded = urlsafe_b64decode(token)
except (TypeError, Error):
- raise UsernameDecryptionException("base64url") # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904
+ raise UsernameDecryptionException("base64url") # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904, E501
if len(base64_decoded) < AES_BLOCK_SIZE_BYTES:
raise UsernameDecryptionException("initialization_vector")
@@ -95,7 +95,7 @@ def decrypt(token): # lint-amnesty, pylint: disable=missing-function-docstring
raise UsernameDecryptionException("padding")
return unpadded
except ValueError:
- raise UsernameDecryptionException("padding") # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904
+ raise UsernameDecryptionException("padding") # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904, E501
def enable_notifications(user):
@@ -164,7 +164,7 @@ def ajax_status(request):
key=NOTIFICATION_PREF_KEY
)
- return HttpResponse(json.dumps({"status": len(qs)}), content_type="application/json") # lint-amnesty, pylint: disable=http-response-with-content-type-json, http-response-with-json-dumps
+ return HttpResponse(json.dumps({"status": len(qs)}), content_type="application/json") # pylint: disable=http-response-with-content-type-json, http-response-with-json-dumps
@require_GET
diff --git a/lms/djangoapps/discussion/rest_api/api.py b/lms/djangoapps/discussion/rest_api/api.py
index 78c0777fc274..d15799d1edf7 100644
--- a/lms/djangoapps/discussion/rest_api/api.py
+++ b/lms/djangoapps/discussion/rest_api/api.py
@@ -515,7 +515,7 @@ def get_non_courseware_topics(
return non_courseware_topics, existing_topic_ids
-def get_course_topics(request: Request, course_key: CourseKey, topic_ids: Optional[Set[str]] = None): # noqa: UP006, UP045 # pylint: disable=line-too-long
+def get_course_topics(request: Request, course_key: CourseKey, topic_ids: Optional[Set[str]] = None): # noqa: UP006, UP045
"""
Returns the course topic listing for the given course and user; filtered
by 'topic_ids' list if given.
diff --git a/lms/djangoapps/discussion/rest_api/forms.py b/lms/djangoapps/discussion/rest_api/forms.py
index 1c4d9e569e52..68b1d8815334 100644
--- a/lms/djangoapps/discussion/rest_api/forms.py
+++ b/lms/djangoapps/discussion/rest_api/forms.py
@@ -86,7 +86,7 @@ def clean_course_id(self):
try:
return CourseLocator.from_string(value)
except InvalidKeyError:
- raise ValidationError(f"'{value}' is not a valid course id") # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904
+ raise ValidationError(f"'{value}' is not a valid course id") # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904, E501
def clean_following(self):
"""Validate following"""
@@ -147,7 +147,7 @@ def clean_course_id(self):
try:
return CourseLocator.from_string(value)
except InvalidKeyError:
- raise ValidationError(f"'{value}' is not a valid course id") # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904
+ raise ValidationError(f"'{value}' is not a valid course id") # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904, E501
class CommentActionsForm(Form):
@@ -185,7 +185,7 @@ def clean_course_id(self):
self.cleaned_data['course_key'] = course_key
return course_id
except InvalidKeyError:
- raise ValidationError(f"'{str(course_id)}' is not a valid course key") # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904
+ raise ValidationError(f"'{str(course_id)}' is not a valid course key") # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904, E501
class CourseDiscussionRolesForm(CourseDiscussionSettingsForm):
diff --git a/lms/djangoapps/discussion/rest_api/tests/test_tasks_v2.py b/lms/djangoapps/discussion/rest_api/tests/test_tasks_v2.py
index 7a83e3f96357..4015fba1a92b 100644
--- a/lms/djangoapps/discussion/rest_api/tests/test_tasks_v2.py
+++ b/lms/djangoapps/discussion/rest_api/tests/test_tasks_v2.py
@@ -352,7 +352,7 @@ def test_send_notification_to_parent_threads(self, is_subscribed):
args_comment_on_response = handler.call_args_list[0][1]['notification_data']
self.assertEqual(handler.call_count, 1) # noqa: PT009
# check if the notification is sent to the parent response creator
- self.assertEqual([int(user_id) for user_id in args_comment_on_response.user_ids], [self.user_2.id]) # noqa: PT009 # pylint: disable=line-too-long
+ self.assertEqual([int(user_id) for user_id in args_comment_on_response.user_ids], [self.user_2.id]) # noqa: PT009
self.assertEqual(args_comment_on_response.notification_type, 'new_comment_on_response') # noqa: PT009
expected_context = {
'replier_name': self.user_3.username,
@@ -769,7 +769,7 @@ def test_response_endorsed_notifications(self):
# Test response endorsed notification
notification_data = handler.call_args_list[1][1]['notification_data']
# Target only the response author
- self.assertEqual([int(user_id) for user_id in notification_data.user_ids], [int(response.user_id)]) # noqa: PT009 # pylint: disable=line-too-long
+ self.assertEqual([int(user_id) for user_id in notification_data.user_ids], [int(response.user_id)]) # noqa: PT009
self.assertEqual(notification_data.notification_type, 'response_endorsed') # noqa: PT009
expected_context = {
diff --git a/lms/djangoapps/discussion/rest_api/utils.py b/lms/djangoapps/discussion/rest_api/utils.py
index a970286ad6e8..ffd6d95cf03a 100644
--- a/lms/djangoapps/discussion/rest_api/utils.py
+++ b/lms/djangoapps/discussion/rest_api/utils.py
@@ -352,7 +352,7 @@ def get_topic_ids_from_topics(topics: List[Dict[str, str]]) -> List[str]: # noq
return [topic['id'] for topic in topics]
-def get_archived_topics(filtered_topic_ids: List[str], topics: List[Dict[str, str]]) -> List[Dict[str, str]]: # noqa: UP006 # pylint: disable=line-too-long
+def get_archived_topics(filtered_topic_ids: List[str], topics: List[Dict[str, str]]) -> List[Dict[str, str]]: # noqa: UP006
"""
This function takes a list of topic ids and a list of topics, and returns the list of archived topics.
diff --git a/lms/djangoapps/discussion/signals/handlers.py b/lms/djangoapps/discussion/signals/handlers.py
index 97af9a727f13..cc4a5c13828a 100644
--- a/lms/djangoapps/discussion/signals/handlers.py
+++ b/lms/djangoapps/discussion/signals/handlers.py
@@ -48,7 +48,7 @@ def update_discussions_on_course_publish(sender, course_key, **kwargs): # pylin
@receiver(signals.comment_created)
def send_discussion_email_notification(sender, user, post,
- **kwargs): # lint-amnesty, pylint: disable=missing-function-docstring, unused-argument
+ **kwargs): # pylint: disable=missing-function-docstring, unused-argument
current_site = get_current_site()
if current_site is None:
log.info('Discussion: No current site, not sending notification about post: %s.', post.id)
diff --git a/lms/djangoapps/discussion/tasks.py b/lms/djangoapps/discussion/tasks.py
index ffbc2c12a301..65f9e374b19b 100644
--- a/lms/djangoapps/discussion/tasks.py
+++ b/lms/djangoapps/discussion/tasks.py
@@ -245,7 +245,7 @@ def _get_course_language(course_id):
return language
-def _build_message_context(context, notification_type='forum_comment'): # lint-amnesty, pylint: disable=missing-function-docstring
+def _build_message_context(context, notification_type='forum_comment'): # pylint: disable=missing-function-docstring
message_context = get_base_template_context(context['site'])
message_context.update(context)
thread_author = User.objects.get(id=context['thread_author_id'])
@@ -273,7 +273,7 @@ def _build_message_context(context, notification_type='forum_comment'): # lint-
return message_context
-def _build_message_context_for_reported_content(context, moderator): # lint-amnesty, pylint: disable=missing-function-docstring
+def _build_message_context_for_reported_content(context, moderator): # pylint: disable=missing-function-docstring
message_context = get_base_template_context(context['site'])
message_context.update(context)
use_mfe_url = ENABLE_DISCUSSIONS_MFE.is_enabled(context['course_id'])
diff --git a/lms/djangoapps/discussion/tests/test_signals.py b/lms/djangoapps/discussion/tests/test_signals.py
index 477b8aacd0a3..84794a6e2bfb 100644
--- a/lms/djangoapps/discussion/tests/test_signals.py
+++ b/lms/djangoapps/discussion/tests/test_signals.py
@@ -44,7 +44,7 @@ def test_comment_created_signal_sends_message(self, mock_send_message, mock_get_
@mock.patch('lms.djangoapps.discussion.signals.handlers.get_current_site', return_value=None)
@mock.patch('lms.djangoapps.discussion.signals.handlers.send_message')
- def test_comment_created_signal_message_not_sent_without_site(self, mock_send_message, mock_get_current_site): # lint-amnesty, pylint: disable=unused-argument
+ def test_comment_created_signal_message_not_sent_without_site(self, mock_send_message, mock_get_current_site): # pylint: disable=unused-argument
with mock.patch('lms.djangoapps.discussion.rest_api.tasks.send_response_notifications.apply_async'):
signals.comment_created.send(sender=self.sender, user=self.user, post=self.post)
diff --git a/lms/djangoapps/discussion/tests/test_views.py b/lms/djangoapps/discussion/tests/test_views.py
index a0c1f9fd80e8..4efadb274fb0 100644
--- a/lms/djangoapps/discussion/tests/test_views.py
+++ b/lms/djangoapps/discussion/tests/test_views.py
@@ -38,7 +38,7 @@
QUERY_COUNT_TABLE_IGNORELIST = WAFFLE_TABLES
-class ViewsExceptionTestCase(UrlResetMixin, ModuleStoreTestCase): # lint-amnesty, pylint: disable=missing-class-docstring
+class ViewsExceptionTestCase(UrlResetMixin, ModuleStoreTestCase): # pylint: disable=missing-class-docstring
@patch.dict("django.conf.settings.FEATURES", {"ENABLE_DISCUSSION_SERVICE": True})
def setUp(self):
@@ -301,7 +301,7 @@ def __repr__(self):
@patch('requests.request', autospec=True)
-class CommentsServiceRequestHeadersTestCase(UrlResetMixin, ModuleStoreTestCase): # lint-amnesty, pylint: disable=missing-class-docstring
+class CommentsServiceRequestHeadersTestCase(UrlResetMixin, ModuleStoreTestCase): # pylint: disable=missing-class-docstring
CREATE_USER = False
@@ -331,7 +331,7 @@ def setUp(self):
self.addCleanup(translation.deactivate)
- def assert_all_calls_have_header(self, mock_request, key, value): # lint-amnesty, pylint: disable=missing-function-docstring
+ def assert_all_calls_have_header(self, mock_request, key, value): # pylint: disable=missing-function-docstring
expected = call(
ANY, # method
ANY, # url
diff --git a/lms/djangoapps/discussion/tests/test_views_v2.py b/lms/djangoapps/discussion/tests/test_views_v2.py
index d3068b7c043a..5c87f9b26c8b 100644
--- a/lms/djangoapps/discussion/tests/test_views_v2.py
+++ b/lms/djangoapps/discussion/tests/test_views_v2.py
@@ -292,7 +292,7 @@ def _configure_mock_responses(
self.set_mock_side_effect("get_user", make_user_callback())
-class SingleThreadTestCase(ModuleStoreTestCase, ForumViewsUtilsMixin): # lint-amnesty, pylint: disable=missing-class-docstring
+class SingleThreadTestCase(ModuleStoreTestCase, ForumViewsUtilsMixin): # pylint: disable=missing-class-docstring
CREATE_USER = False
@@ -473,7 +473,7 @@ def test_private_team_thread_html(self):
assert 'This is a private discussion. You do not have permissions to view this discussion' in html
-class SingleCohortedThreadTestCase(CohortedTestCase, ForumViewsUtilsMixin): # lint-amnesty, pylint: disable=missing-class-docstring
+class SingleCohortedThreadTestCase(CohortedTestCase, ForumViewsUtilsMixin): # pylint: disable=missing-class-docstring
@classmethod
def setUpClass(cls):
@@ -544,7 +544,7 @@ def test_html(self):
self.assertRegex(html, r'"group_name": "student_cohort"') # noqa: PT009
-class SingleThreadAccessTestCase(CohortedTestCase, ForumViewsUtilsMixin): # lint-amnesty, pylint: disable=missing-class-docstring
+class SingleThreadAccessTestCase(CohortedTestCase, ForumViewsUtilsMixin): # pylint: disable=missing-class-docstring
@classmethod
def setUpClass(cls):
@@ -556,7 +556,7 @@ def tearDownClass(cls):
super().tearDownClass()
super().disposeForumMocks()
- def call_view(self, commentable_id, user, group_id, thread_group_id=None, pass_group_id=True): # lint-amnesty, pylint: disable=missing-function-docstring
+ def call_view(self, commentable_id, user, group_id, thread_group_id=None, pass_group_id=True): # pylint: disable=missing-function-docstring
thread_id = "test_thread_id"
self._configure_mock_responses(
course=self.course, text="dummy context", thread_id=thread_id, group_id=thread_group_id
@@ -648,7 +648,7 @@ def test_private_team_thread(self):
assert views.TEAM_PERMISSION_MESSAGE == response.content.decode('utf-8')
-class SingleThreadGroupIdTestCase(CohortedTestCase, GroupIdAssertionMixinV2, ForumViewsUtilsMixin): # lint-amnesty, pylint: disable=missing-class-docstring
+class SingleThreadGroupIdTestCase(CohortedTestCase, GroupIdAssertionMixinV2, ForumViewsUtilsMixin): # pylint: disable=missing-class-docstring
function_name = "get_thread"
@classmethod
@@ -661,7 +661,7 @@ def tearDownClass(cls):
super().tearDownClass()
super().disposeForumMocks()
- def call_view(self, commentable_id, user, group_id, pass_group_id=True, is_ajax=False): # lint-amnesty, pylint: disable=missing-function-docstring
+ def call_view(self, commentable_id, user, group_id, pass_group_id=True, is_ajax=False): # pylint: disable=missing-function-docstring
self._configure_mock_responses(
course=self.course, text="dummy context", group_id=self.student_cohort.id
)
@@ -702,7 +702,7 @@ def test_group_info_in_ajax_response(self):
)
-class SingleThreadContentGroupTestCase(UrlResetMixin, ContentGroupTestCase, ForumViewsUtilsMixin): # lint-amnesty, pylint: disable=missing-class-docstring
+class SingleThreadContentGroupTestCase(UrlResetMixin, ContentGroupTestCase, ForumViewsUtilsMixin): # pylint: disable=missing-class-docstring
@patch.dict("django.conf.settings.FEATURES", {"ENABLE_DISCUSSION_SERVICE": True})
def setUp(self):
@@ -821,7 +821,7 @@ def test_standalone_context_respected(self):
self.assert_can_access(self.beta_user, self.alpha_block.discussion_id, thread_id, True)
-class FollowedThreadsDiscussionGroupIdTestCase(CohortedTestCase, CohortedTopicGroupIdTestMixinV2, ForumViewsUtilsMixin): # lint-amnesty, pylint: disable=missing-class-docstring
+class FollowedThreadsDiscussionGroupIdTestCase(CohortedTestCase, CohortedTopicGroupIdTestMixinV2, ForumViewsUtilsMixin): # pylint: disable=missing-class-docstring
function_name = "get_user_subscriptions"
@classmethod
@@ -872,7 +872,7 @@ def test_group_info_in_ajax_response(self):
)
-class SingleThreadUnicodeTestCase(SharedModuleStoreTestCase, UnicodeTestMixin, ForumViewsUtilsMixin): # lint-amnesty, pylint: disable=missing-class-docstring
+class SingleThreadUnicodeTestCase(SharedModuleStoreTestCase, UnicodeTestMixin, ForumViewsUtilsMixin): # pylint: disable=missing-class-docstring
@classmethod
def setUpClass(cls): # pylint: disable=super-method-not-called
@@ -1996,7 +1996,7 @@ def _test_unicode_data(self, text): # lint-amnesty, pylint: disable=missing-fun
assert response_data['discussion_data'][0]['body'] == text
-class UserProfileUnicodeTestCase(SharedModuleStoreTestCase, UnicodeTestMixin, ForumViewsUtilsMixin): # lint-amnesty, pylint: disable=missing-class-docstring
+class UserProfileUnicodeTestCase(SharedModuleStoreTestCase, UnicodeTestMixin, ForumViewsUtilsMixin): # pylint: disable=missing-class-docstring
@classmethod
def setUpClass(cls):
@@ -2031,7 +2031,7 @@ def _test_unicode_data(self, text): # lint-amnesty, pylint: disable=missing-fun
assert response_data['discussion_data'][0]['body'] == text
-class ForumMFETestCase(SharedModuleStoreTestCase, ModuleStoreTestCase, MockForumApiMixin): # lint-amnesty, pylint: disable=missing-class-docstring
+class ForumMFETestCase(SharedModuleStoreTestCase, ModuleStoreTestCase, MockForumApiMixin): # pylint: disable=missing-class-docstring
"""
Tests that the MFE upgrade banner and MFE is shown in the correct situation with the correct UI
"""
diff --git a/lms/djangoapps/discussion/views.py b/lms/djangoapps/discussion/views.py
index e1c47f3b2ef8..5a116ec1a3d3 100644
--- a/lms/djangoapps/discussion/views.py
+++ b/lms/djangoapps/discussion/views.py
@@ -806,7 +806,7 @@ def render_to_fragment( # lint-amnesty, pylint: disable=arguments-differ
course_key = CourseKey.from_string(course_id)
# Force using the legacy view if a user profile is requested or the URL contains a specific topic or thread
force_legacy_view = (profile_page_context or thread_id or discussion_id) # noqa: F841
- is_educator_or_staff = is_course_staff(course_key, request.user) or GlobalStaff().has_user(request.user) # noqa: F841 # pylint: disable=line-too-long
+ is_educator_or_staff = is_course_staff(course_key, request.user) or GlobalStaff().has_user(request.user) # noqa: F841
try:
base_context = _create_base_discussion_view_context(request, course_key)
# Note:
diff --git a/lms/djangoapps/edxnotes/helpers.py b/lms/djangoapps/edxnotes/helpers.py
index c3491e55a2ce..b1e75d84a0ec 100644
--- a/lms/djangoapps/edxnotes/helpers.py
+++ b/lms/djangoapps/edxnotes/helpers.py
@@ -114,7 +114,7 @@ def send_request(user, course_id, page, page_size, path="", text=None):
)
except RequestException:
log.error("Failed to connect to edx-notes-api: url=%s, params=%s", url, str(params))
- raise EdxNotesServiceUnavailable(_("EdxNotes Service is unavailable. Please try again in a few minutes.")) # lint-amnesty, pylint: disable=raise-missing-from,line-too-long # noqa: B904
+ raise EdxNotesServiceUnavailable(_("EdxNotes Service is unavailable. Please try again in a few minutes.")) # pylint: disable=raise-missing-from # noqa: B904
return response
@@ -145,7 +145,7 @@ def delete_all_notes_for_user(user):
)
except RequestException:
log.error("Failed to connect to edx-notes-api: url=%s, params=%s", url, str(headers))
- raise EdxNotesServiceUnavailable(_("EdxNotes Service is unavailable. Please try again in a few minutes.")) # lint-amnesty, pylint: disable=raise-missing-from,line-too-long # noqa: B904
+ raise EdxNotesServiceUnavailable(_("EdxNotes Service is unavailable. Please try again in a few minutes.")) # pylint: disable=raise-missing-from # noqa: B904
return response
@@ -203,7 +203,7 @@ def preprocess_collection(user, course, collection):
if not section:
log.debug("Section not found: %s", usage_key)
continue
- if section.location in list(cache.keys()): # lint-amnesty, pylint: disable=consider-iterating-dictionary
+ if section.location in list(cache.keys()): # pylint: disable=consider-iterating-dictionary
usage_context = cache[section.location]
usage_context.update({
"unit": get_block_context(course, unit),
@@ -217,7 +217,7 @@ def preprocess_collection(user, course, collection):
if not chapter:
log.debug("Chapter not found: %s", usage_key)
continue
- if chapter.location in list(cache.keys()): # lint-amnesty, pylint: disable=consider-iterating-dictionary
+ if chapter.location in list(cache.keys()): # pylint: disable=consider-iterating-dictionary
usage_context = cache[chapter.location]
usage_context.update({
"unit": get_block_context(course, unit),
@@ -338,7 +338,7 @@ def get_notes(request, course, page=DEFAULT_PAGE, page_size=DEFAULT_PAGE_SIZE, t
collection = json.loads(response.content.decode('utf-8'))
except ValueError:
log.error("Invalid JSON response received from notes api: response_content=%s", response.content)
- raise EdxNotesParseError(_("Invalid JSON response received from notes api.")) # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904
+ raise EdxNotesParseError(_("Invalid JSON response received from notes api.")) # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904, E501
# Verify response dict structure
expected_keys = ['total', 'rows', 'num_pages', 'start', 'next', 'previous', 'current_page']
@@ -388,7 +388,7 @@ def get_endpoint(api_url, path=""):
return api_url + path
except (AttributeError, KeyError):
- raise ImproperlyConfigured(_("No endpoint was provided for EdxNotes.")) # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904
+ raise ImproperlyConfigured(_("No endpoint was provided for EdxNotes.")) # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904, E501
def get_public_endpoint(path=""):
diff --git a/lms/djangoapps/edxnotes/plugins.py b/lms/djangoapps/edxnotes/plugins.py
index 3c590977c762..25c497857a55 100644
--- a/lms/djangoapps/edxnotes/plugins.py
+++ b/lms/djangoapps/edxnotes/plugins.py
@@ -91,7 +91,7 @@ def set_enabled(cls, course_key: CourseKey, enabled: bool, user: 'User') -> bool
return enabled
@classmethod
- def get_allowed_operations(cls, course_key: CourseKey, user: Optional[User] = None) -> Dict[str, bool]: # noqa: UP006, UP045 # pylint: disable=line-too-long
+ def get_allowed_operations(cls, course_key: CourseKey, user: Optional[User] = None) -> Dict[str, bool]: # noqa: UP006, UP045
"""
Returns allowed operations for edxnotes app.
"""
diff --git a/lms/djangoapps/edxnotes/tests.py b/lms/djangoapps/edxnotes/tests.py
index 3be1376cd39a..f9da11b67ede 100644
--- a/lms/djangoapps/edxnotes/tests.py
+++ b/lms/djangoapps/edxnotes/tests.py
@@ -110,7 +110,7 @@ def setUp(self):
ApplicationFactory(name="edx-notes")
self.course = CourseFactory(edxnotes=True, default_store=ModuleStoreEnum.Type.split)
self.user = UserFactory()
- self.client.login(username=self.user.username, password=UserFactory._DEFAULT_PASSWORD) # lint-amnesty, pylint: disable=protected-access
+ self.client.login(username=self.user.username, password=UserFactory._DEFAULT_PASSWORD) # pylint: disable=protected-access
self.problem = TestProblem(self.course, self.user)
@patch.dict("django.conf.settings.FEATURES", {'ENABLE_EDXNOTES': True})
@@ -238,7 +238,7 @@ def setUp(self):
self.child_html_block = self.store.get_item(self.child_html_block.location)
self.user = UserFactory()
- self.client.login(username=self.user.username, password=UserFactory._DEFAULT_PASSWORD) # lint-amnesty, pylint: disable=protected-access
+ self.client.login(username=self.user.username, password=UserFactory._DEFAULT_PASSWORD) # pylint: disable=protected-access
self.request = RequestFactory().request()
self.request.user = self.user
@@ -956,19 +956,19 @@ def setUp(self):
self.course = CourseFactory(edxnotes=True)
self.user = UserFactory()
CourseEnrollmentFactory(user=self.user, course_id=self.course.id) # lint-amnesty, pylint: disable=no-member
- self.client.login(username=self.user.username, password=UserFactory._DEFAULT_PASSWORD) # lint-amnesty, pylint: disable=protected-access
+ self.client.login(username=self.user.username, password=UserFactory._DEFAULT_PASSWORD) # pylint: disable=protected-access
self.notes_page_url = reverse("edxnotes", args=[str(self.course.id)]) # lint-amnesty, pylint: disable=no-member
self.notes_url = reverse("notes", args=[str(self.course.id)]) # lint-amnesty, pylint: disable=no-member
self.get_token_url = reverse("get_token", args=[str(self.course.id)]) # lint-amnesty, pylint: disable=no-member
- self.visibility_url = reverse("edxnotes_visibility", args=[str(self.course.id)]) # lint-amnesty, pylint: disable=no-member
+ self.visibility_url = reverse("edxnotes_visibility", args=[str(self.course.id)]) # pylint: disable=no-member
def _get_course_block(self):
"""
Returns the course block.
"""
- field_data_cache = FieldDataCache([self.course], self.course.id, self.user) # lint-amnesty, pylint: disable=no-member
+ field_data_cache = FieldDataCache([self.course], self.course.id, self.user) # pylint: disable=no-member
return get_block_for_descriptor(
- self.user, MagicMock(), self.course, field_data_cache, self.course.id, course=self.course # lint-amnesty, pylint: disable=no-member
+ self.user, MagicMock(), self.course, field_data_cache, self.course.id, course=self.course # pylint: disable=no-member
)
def test_edxnotes_tab(self):
diff --git a/lms/djangoapps/edxnotes/views.py b/lms/djangoapps/edxnotes/views.py
index faf172b67af2..3cf0366262ce 100644
--- a/lms/djangoapps/edxnotes/views.py
+++ b/lms/djangoapps/edxnotes/views.py
@@ -175,7 +175,7 @@ def notes(request, course_id):
except (EdxNotesParseError, EdxNotesServiceUnavailable) as err:
return JsonResponseBadRequest({"error": str(err)}, status=500)
- return HttpResponse(json.dumps(notes_info, cls=NoteJSONEncoder), content_type="application/json") # lint-amnesty, pylint: disable=http-response-with-content-type-json, http-response-with-json-dumps
+ return HttpResponse(json.dumps(notes_info, cls=NoteJSONEncoder), content_type="application/json") # pylint: disable=http-response-with-content-type-json, http-response-with-json-dumps
@login_required
diff --git a/lms/djangoapps/experiments/factories.py b/lms/djangoapps/experiments/factories.py
index 049fb79a9821..fb2949052431 100644
--- a/lms/djangoapps/experiments/factories.py
+++ b/lms/djangoapps/experiments/factories.py
@@ -20,7 +20,7 @@ class Meta:
value = factory.Faker('word')
-class ExperimentKeyValueFactory(factory.django.DjangoModelFactory): # lint-amnesty, pylint: disable=missing-class-docstring
+class ExperimentKeyValueFactory(factory.django.DjangoModelFactory): # pylint: disable=missing-class-docstring
class Meta:
model = ExperimentKeyValue
diff --git a/lms/djangoapps/experiments/flags.py b/lms/djangoapps/experiments/flags.py
index 5aaade0eefa8..6fb5ddd90c5f 100644
--- a/lms/djangoapps/experiments/flags.py
+++ b/lms/djangoapps/experiments/flags.py
@@ -75,7 +75,7 @@ def __init__(
self.num_buckets = num_buckets
self.experiment_id = experiment_id
self.bucket_flags = [
- CourseWaffleFlag(f'{flag_name}.{bucket}', module_name) # lint-amnesty, pylint: disable=toggle-missing-annotation
+ CourseWaffleFlag(f'{flag_name}.{bucket}', module_name) # pylint: disable=toggle-missing-annotation
for bucket in range(num_buckets)
]
self.use_course_aware_bucketing = use_course_aware_bucketing
diff --git a/lms/djangoapps/experiments/serializers.py b/lms/djangoapps/experiments/serializers.py
index 2b88a13f2a92..c0969f703295 100644
--- a/lms/djangoapps/experiments/serializers.py
+++ b/lms/djangoapps/experiments/serializers.py
@@ -11,7 +11,7 @@
User = get_user_model() # pylint:disable=invalid-name
-class ExperimentDataCreateSerializer(serializers.ModelSerializer): # lint-amnesty, pylint: disable=missing-class-docstring
+class ExperimentDataCreateSerializer(serializers.ModelSerializer): # pylint: disable=missing-class-docstring
user = serializers.SlugRelatedField(slug_field='username', default=serializers.CurrentUserDefault(), required=False,
queryset=User.objects.all())
diff --git a/lms/djangoapps/experiments/tests/test_flags.py b/lms/djangoapps/experiments/tests/test_flags.py
index 66dc4dd6eb9e..75849994b126 100644
--- a/lms/djangoapps/experiments/tests/test_flags.py
+++ b/lms/djangoapps/experiments/tests/test_flags.py
@@ -40,7 +40,7 @@ def setUp(self):
self.addCleanup(set_current_request, None)
set_current_request(self.request)
- self.flag = ExperimentWaffleFlag('experiments.test', __name__, num_buckets=2, experiment_id=0) # lint-amnesty, pylint: disable=toggle-missing-annotation
+ self.flag = ExperimentWaffleFlag('experiments.test', __name__, num_buckets=2, experiment_id=0) # pylint: disable=toggle-missing-annotation
self.key = CourseKey.from_string('a/b/c')
bucket_patch = patch('lms.djangoapps.experiments.flags.stable_bucketing_hash_group', return_value=1)
@@ -107,7 +107,7 @@ def test_enrollment_end(self, experiment_end, enrollment_created, expected_bucke
)
@ddt.unpack
def test_forcing_bucket(self, active, expected_bucket):
- bucket_flag = CourseWaffleFlag('experiments.test.0', __name__) # lint-amnesty, pylint: disable=toggle-missing-annotation
+ bucket_flag = CourseWaffleFlag('experiments.test.0', __name__) # pylint: disable=toggle-missing-annotation
with override_waffle_flag(bucket_flag, active=active):
assert self.get_bucket() == expected_bucket
@@ -165,7 +165,7 @@ def test_app_label_experiment_name(self):
assert 'experiments' == self.flag._app_label
assert 'test' == self.flag._experiment_name
- flag = ExperimentWaffleFlag("namespace.flag.name", __name__) # lint-amnesty, pylint: disable=toggle-missing-annotation
+ flag = ExperimentWaffleFlag("namespace.flag.name", __name__) # pylint: disable=toggle-missing-annotation
assert 'namespace' == flag._app_label
assert 'flag.name' == flag._experiment_name
@@ -178,12 +178,12 @@ class ExperimentWaffleFlagCourseAwarenessTest(SharedModuleStoreTestCase):
course_aware_flag = ExperimentWaffleFlag( # lint-amnesty, pylint: disable=toggle-missing-annotation
'exp.aware', __name__, num_buckets=20, use_course_aware_bucketing=True,
)
- course_aware_subflag = CourseWaffleFlag('exp.aware.1', __name__) # lint-amnesty, pylint: disable=toggle-missing-annotation
+ course_aware_subflag = CourseWaffleFlag('exp.aware.1', __name__) # pylint: disable=toggle-missing-annotation
course_unaware_flag = ExperimentWaffleFlag( # lint-amnesty, pylint: disable=toggle-missing-annotation
'exp.unaware', __name__, num_buckets=20, use_course_aware_bucketing=False,
)
- course_unaware_subflag = CourseWaffleFlag('exp.unaware.1', __name__) # lint-amnesty, pylint: disable=toggle-missing-annotation
+ course_unaware_subflag = CourseWaffleFlag('exp.unaware.1', __name__) # pylint: disable=toggle-missing-annotation
course_key_1 = CourseKey.from_string("x/y/1")
course_key_2 = CourseKey.from_string("x/y/22")
diff --git a/lms/djangoapps/experiments/tests/test_views.py b/lms/djangoapps/experiments/tests/test_views.py
index 43cc46df99b5..22d55ee97a12 100644
--- a/lms/djangoapps/experiments/tests/test_views.py
+++ b/lms/djangoapps/experiments/tests/test_views.py
@@ -26,16 +26,16 @@
CROSS_DOMAIN_REFERER = 'https://ecommerce.edx.org'
-class ExperimentDataViewSetTests(APITestCase, ModuleStoreTestCase): # lint-amnesty, pylint: disable=missing-class-docstring
+class ExperimentDataViewSetTests(APITestCase, ModuleStoreTestCase): # pylint: disable=missing-class-docstring
- def assert_data_created_for_user(self, user, method='post', status=201): # lint-amnesty, pylint: disable=missing-function-docstring
+ def assert_data_created_for_user(self, user, method='post', status=201): # pylint: disable=missing-function-docstring
url = reverse('api_experiments:v0:data-list')
data = {
'experiment_id': 1,
'key': 'foo',
'value': 'bar',
}
- self.client.login(username=user.username, password=UserFactory._DEFAULT_PASSWORD) # lint-amnesty, pylint: disable=protected-access
+ self.client.login(username=user.username, password=UserFactory._DEFAULT_PASSWORD) # pylint: disable=protected-access
response = getattr(self.client, method)(url, data)
assert response.status_code == status
@@ -55,7 +55,7 @@ def test_list_permissions(self):
ExperimentDataFactory()
datum = ExperimentDataFactory(user=user)
- self.client.login(username=user.username, password=UserFactory._DEFAULT_PASSWORD) # lint-amnesty, pylint: disable=protected-access
+ self.client.login(username=user.username, password=UserFactory._DEFAULT_PASSWORD) # pylint: disable=protected-access
response = self.client.get(url)
assert response.status_code == 200
@@ -65,7 +65,7 @@ def test_list_filtering(self):
""" Users should be able to filter by the experiment_id and key fields. """
url = reverse('api_experiments:v0:data-list')
user = UserFactory()
- self.client.login(username=user.username, password=UserFactory._DEFAULT_PASSWORD) # lint-amnesty, pylint: disable=protected-access
+ self.client.login(username=user.username, password=UserFactory._DEFAULT_PASSWORD) # pylint: disable=protected-access
experiment_id = 1
ExperimentDataFactory()
@@ -97,12 +97,12 @@ def test_read_permissions(self):
response = self.client.get(url)
assert response.status_code == 401
- self.client.login(username=user.username, password=UserFactory._DEFAULT_PASSWORD) # lint-amnesty, pylint: disable=protected-access
+ self.client.login(username=user.username, password=UserFactory._DEFAULT_PASSWORD) # pylint: disable=protected-access
response = self.client.get(url)
assert response.status_code == 200
other_user = UserFactory()
- self.client.login(username=other_user.username, password=UserFactory._DEFAULT_PASSWORD) # lint-amnesty, pylint: disable=protected-access
+ self.client.login(username=other_user.username, password=UserFactory._DEFAULT_PASSWORD) # pylint: disable=protected-access
response = self.client.get(url)
assert response.status_code == 404
@@ -120,7 +120,7 @@ def test_create_permissions(self):
'key': 'foo',
'value': 'bar',
}
- self.client.login(username=user.username, password=UserFactory._DEFAULT_PASSWORD) # lint-amnesty, pylint: disable=protected-access
+ self.client.login(username=user.username, password=UserFactory._DEFAULT_PASSWORD) # pylint: disable=protected-access
# Users can create data for themselves
response = self.client.post(url, data)
@@ -160,11 +160,11 @@ def test_update_permissions(self):
response = self.client.patch(url, data)
assert response.status_code == 401
- self.client.login(username=user.username, password=UserFactory._DEFAULT_PASSWORD) # lint-amnesty, pylint: disable=protected-access
+ self.client.login(username=user.username, password=UserFactory._DEFAULT_PASSWORD) # pylint: disable=protected-access
response = self.client.patch(url, data)
assert response.status_code == 200
- self.client.login(username=other_user.username, password=UserFactory._DEFAULT_PASSWORD) # lint-amnesty, pylint: disable=protected-access
+ self.client.login(username=other_user.username, password=UserFactory._DEFAULT_PASSWORD) # pylint: disable=protected-access
response = self.client.patch(url, data)
assert response.status_code == 404
@@ -288,7 +288,7 @@ def test_permissions(self):
assert response.status_code == 200
user = UserFactory(is_staff=False)
- self.client.login(username=user.username, password=UserFactory._DEFAULT_PASSWORD) # lint-amnesty, pylint: disable=protected-access
+ self.client.login(username=user.username, password=UserFactory._DEFAULT_PASSWORD) # pylint: disable=protected-access
response = self.client.put(url, {})
assert response.status_code == 403
@@ -308,7 +308,7 @@ def test_UserMetaDataView_get_success_same_user(self):
lookup_user = UserFactory()
lookup_course = CourseFactory.create(start=now() - timedelta(days=30))
call_args = [lookup_user.username, lookup_course.id]
- self.client.login(username=lookup_user.username, password=UserFactory._DEFAULT_PASSWORD) # lint-amnesty, pylint: disable=protected-access
+ self.client.login(username=lookup_user.username, password=UserFactory._DEFAULT_PASSWORD) # pylint: disable=protected-access
response = self.client.get(reverse('api_experiments:user_metadata', args=call_args))
assert response.status_code == 200
@@ -320,7 +320,7 @@ def test_UserMetaDataView_get_success_staff_user(self):
call_args = [lookup_user.username, lookup_course.id]
staff_user = UserFactory(is_staff=True)
- self.client.login(username=staff_user.username, password=UserFactory._DEFAULT_PASSWORD) # lint-amnesty, pylint: disable=protected-access
+ self.client.login(username=staff_user.username, password=UserFactory._DEFAULT_PASSWORD) # pylint: disable=protected-access
response = self.client.get(reverse('api_experiments:user_metadata', args=call_args))
assert response.status_code == 200
@@ -342,8 +342,8 @@ def test_UserMetaDataView_get_missing_course(self):
""" Request fails when not course not found """
lookup_user = UserFactory()
lookup_course = CourseFactory.create(start=now() - timedelta(days=30))
- call_args = [lookup_user.username, lookup_course.id] # lint-amnesty, pylint: disable=unused-variable # noqa: F841
- self.client.login(username=lookup_user.username, password=UserFactory._DEFAULT_PASSWORD) # lint-amnesty, pylint: disable=protected-access
+ call_args = [lookup_user.username, lookup_course.id] # pylint: disable=unused-variable # noqa: F841
+ self.client.login(username=lookup_user.username, password=UserFactory._DEFAULT_PASSWORD) # pylint: disable=protected-access
bogus_course_name = str(lookup_course.id) + '_FOOBAR'
call_args_with_bogus_course = [lookup_user.username, bogus_course_name]
diff --git a/lms/djangoapps/experiments/utils.py b/lms/djangoapps/experiments/utils.py
index b7c853a92c92..177b738005e7 100644
--- a/lms/djangoapps/experiments/utils.py
+++ b/lms/djangoapps/experiments/utils.py
@@ -88,7 +88,7 @@ def check_and_get_upgrade_link_and_date(user, enrollment=None, course=None):
if enrollment:
if course and enrollment.course_id != course.id:
- logger.warning('{} refers to a different course than {} which was supplied. Enrollment course id={}, ' # noqa: UP032 # pylint: disable=line-too-long
+ logger.warning('{} refers to a different course than {} which was supplied. Enrollment course id={}, ' # noqa: UP032
'repr={!r}, deprecated={}. Course id={}, repr={!r}, deprecated={}.'
.format(enrollment,
course,
diff --git a/lms/djangoapps/grades/course_grade_factory.py b/lms/djangoapps/grades/course_grade_factory.py
index 8c8da811efd7..ef3aa4192bcd 100644
--- a/lms/djangoapps/grades/course_grade_factory.py
+++ b/lms/djangoapps/grades/course_grade_factory.py
@@ -97,7 +97,7 @@ def iter(
for user in users:
yield self._iter_grade_result(user, course_data, force_update)
- def _iter_grade_result(self, user, course_data, force_update): # lint-amnesty, pylint: disable=missing-function-docstring
+ def _iter_grade_result(self, user, course_data, force_update): # pylint: disable=missing-function-docstring
try:
kwargs = {
'user': user,
@@ -169,7 +169,7 @@ def _update(user, course_data, force_update_subsections=False):
should_persist = course_grade.attempted
if should_persist:
- course_grade._subsection_grade_factory.bulk_create_unsaved() # lint-amnesty, pylint: disable=protected-access
+ course_grade._subsection_grade_factory.bulk_create_unsaved() # pylint: disable=protected-access
PersistentCourseGrade.update_or_create(
user_id=user.id,
course_id=course_data.course_key,
diff --git a/lms/djangoapps/grades/events.py b/lms/djangoapps/grades/events.py
index e386d0bc6326..35c4fa76f1bf 100644
--- a/lms/djangoapps/grades/events.py
+++ b/lms/djangoapps/grades/events.py
@@ -270,7 +270,7 @@ def fire_segment_event_on_course_grade_passed_first_time(user_id, course_locator
event_properties=event_properties
)
- log.info("Segment event fired for passed learners. Event: [{}], Data: [{}]".format(event_name, event_properties)) # noqa: UP032 # pylint: disable=line-too-long
+ log.info("Segment event fired for passed learners. Event: [{}], Data: [{}]".format(event_name, event_properties)) # noqa: UP032
def _emit_course_passing_status_update(user, course_id, is_passing):
diff --git a/lms/djangoapps/grades/management/commands/compute_grades.py b/lms/djangoapps/grades/management/commands/compute_grades.py
index ae3e1986c217..04c44831df56 100644
--- a/lms/djangoapps/grades/management/commands/compute_grades.py
+++ b/lms/djangoapps/grades/management/commands/compute_grades.py
@@ -103,7 +103,7 @@ def _shuffled_task_kwargs(self, options):
# This is a tuple to reduce memory consumption.
# The dictionaries with their extra overhead will be created
# and consumed one at a time.
- for task_arg_tuple in tasks._course_task_args(course_key, **options): # lint-amnesty, pylint: disable=protected-access
+ for task_arg_tuple in tasks._course_task_args(course_key, **options): # pylint: disable=protected-access
all_args.append(task_arg_tuple)
all_args.sort(key=lambda x: hashlib.md5(f'{x!r}'.encode('utf-8')).digest()) # noqa: UP012
diff --git a/lms/djangoapps/grades/management/commands/tests/test_recalculate_subsection_grades.py b/lms/djangoapps/grades/management/commands/tests/test_recalculate_subsection_grades.py
index 5bf44c01dc81..8e021e4e4f31 100644
--- a/lms/djangoapps/grades/management/commands/tests/test_recalculate_subsection_grades.py
+++ b/lms/djangoapps/grades/management/commands/tests/test_recalculate_subsection_grades.py
@@ -62,7 +62,7 @@ def test_csm(self, task_mock, id_mock, csm_mock):
id_mock.return_value.id = "ID"
self._run_command_and_check_output(task_mock, ScoreDatabaseTableEnum.courseware_student_module)
- def _run_command_and_check_output(self, task_mock, score_db_table, include_anonymous_id=False): # lint-amnesty, pylint: disable=missing-function-docstring
+ def _run_command_and_check_output(self, task_mock, score_db_table, include_anonymous_id=False): # pylint: disable=missing-function-docstring
self.command.handle(modified_start='2016-08-25 16:42', modified_end='2018-08-25 16:44')
kwargs = {
"user_id": "ID",
diff --git a/lms/djangoapps/grades/models.py b/lms/djangoapps/grades/models.py
index 9210883953e7..27811d1071bd 100644
--- a/lms/djangoapps/grades/models.py
+++ b/lms/djangoapps/grades/models.py
@@ -747,7 +747,7 @@ class PersistentSubsectionGradeOverride(models.Model):
class Meta:
app_label = "grades"
- grade = models.OneToOneField(PersistentSubsectionGrade, related_name='override', on_delete=models.CASCADE) # noqa: DJ012 # pylint: disable=line-too-long
+ grade = models.OneToOneField(PersistentSubsectionGrade, related_name='override', on_delete=models.CASCADE) # noqa: DJ012
# Created/modified timestamps prevent race-conditions when using with async rescoring tasks
created = models.DateTimeField(auto_now_add=True, db_index=True)
@@ -809,7 +809,7 @@ def get_override(cls, user_id, usage_key): # lint-amnesty, pylint: disable=miss
@classmethod
def update_or_create_override(
- cls, requesting_user, subsection_grade_model, feature=None, action=None, **override_data # lint-amnesty, pylint: disable=unused-argument
+ cls, requesting_user, subsection_grade_model, feature=None, action=None, **override_data # pylint: disable=unused-argument
):
"""
Creates or updates an override object for the given PersistentSubsectionGrade.
diff --git a/lms/djangoapps/grades/rest_api/v1/gradebook_views.py b/lms/djangoapps/grades/rest_api/v1/gradebook_views.py
index 42a076d7628e..f7e62b2b1ada 100644
--- a/lms/djangoapps/grades/rest_api/v1/gradebook_views.py
+++ b/lms/djangoapps/grades/rest_api/v1/gradebook_views.py
@@ -297,7 +297,7 @@ def can_see_bulk_management(self, course_key):
master's track or is enabled with the grades.bulk_management course waffle flag.
"""
course_modes = get_course_enrollment_details(str(course_key), include_expired=True).get('course_modes', [])
- course_has_masters_track = any((course_mode['slug'] == CourseMode.MASTERS for course_mode in course_modes)) # noqa: UP034 # pylint: disable=line-too-long
+ course_has_masters_track = any((course_mode['slug'] == CourseMode.MASTERS for course_mode in course_modes)) # noqa: UP034
return course_has_masters_track or gradebook_bulk_management_enabled(course_key)
def _get_assignment_types(self, course):
diff --git a/lms/djangoapps/grades/rest_api/v1/tests/mixins.py b/lms/djangoapps/grades/rest_api/v1/tests/mixins.py
index eaea8b9c3e3b..c42ed06e112d 100644
--- a/lms/djangoapps/grades/rest_api/v1/tests/mixins.py
+++ b/lms/djangoapps/grades/rest_api/v1/tests/mixins.py
@@ -73,7 +73,7 @@ def _create_user_enrollments(self, *users):
created=self.date,
)
- def _create_user_program_enrollments(self, *users, **kwargs): # lint-amnesty, pylint: disable=missing-function-docstring
+ def _create_user_program_enrollments(self, *users, **kwargs): # pylint: disable=missing-function-docstring
# supply mode for enrollment. Use 'masters' to create a masters track enrollment
for index, user in enumerate(users):
course_enrollment = CourseEnrollmentFactory(
diff --git a/lms/djangoapps/grades/scores.py b/lms/djangoapps/grades/scores.py
index 70efa28a01b0..4d14df34d9f8 100644
--- a/lms/djangoapps/grades/scores.py
+++ b/lms/djangoapps/grades/scores.py
@@ -167,7 +167,7 @@ def _get_score_from_submissions(submissions_scores, block):
first_attempted = submission_value['created_at']
weighted_earned = submission_value['points_earned']
weighted_possible = submission_value['points_possible']
- assert weighted_earned >= 0.0 and weighted_possible > 0.0 # per contract from submissions API # noqa: PT018 # pylint: disable=line-too-long
+ assert weighted_earned >= 0.0 and weighted_possible > 0.0 # per contract from submissions API # noqa: E501, PT018
return (None, None) + (weighted_earned, weighted_possible) + (first_attempted,)
diff --git a/lms/djangoapps/grades/subsection_grade_factory.py b/lms/djangoapps/grades/subsection_grade_factory.py
index 7e6fea6c0995..68eff968f92b 100644
--- a/lms/djangoapps/grades/subsection_grade_factory.py
+++ b/lms/djangoapps/grades/subsection_grade_factory.py
@@ -70,7 +70,7 @@ def bulk_create_unsaved(self):
)
self._unsaved_subsection_grades.clear()
- def update(self, subsection, only_if_higher=None, score_deleted=False, force_update_subsections=False, persist_grade=True): # lint-amnesty, pylint: disable=line-too-long
+ def update(self, subsection, only_if_higher=None, score_deleted=False, force_update_subsections=False, persist_grade=True): # noqa: E501
"""
Updates the SubsectionGrade object for the student and subsection.
"""
diff --git a/lms/djangoapps/grades/tasks.py b/lms/djangoapps/grades/tasks.py
index b69e3a1d0f85..b0cb60d5b7f3 100644
--- a/lms/djangoapps/grades/tasks.py
+++ b/lms/djangoapps/grades/tasks.py
@@ -297,7 +297,7 @@ def _has_db_updated_with_new_score(self, scored_block_usage_key, **kwargs):
if not db_is_updated:
log.info(
- "Grades: tasks._has_database_updated_with_new_score is False. Task ID: {}. Kwargs: {}. Found " # noqa: UP032 # pylint: disable=line-too-long
+ "Grades: tasks._has_database_updated_with_new_score is False. Task ID: {}. Kwargs: {}. Found " # noqa: UP032
"modified time: {}".format(
self.request.id,
kwargs,
@@ -333,7 +333,7 @@ def _update_subsection_grades(
if not subsections_to_update:
clear_course_from_cache(course_usage_key.course_key)
raise UsageKeyNotInBlockStructure(
- "Scored block usage_key '{0}' is not found in the block_structure with root '{1}'".format( # noqa: UP030, UP032 # pylint: disable=line-too-long
+ "Scored block usage_key '{0}' is not found in the block_structure with root '{1}'".format( # noqa: UP030, UP032
str(scored_block_usage_key),
str(course_usage_key)
)
diff --git a/lms/djangoapps/grades/tests/test_course_data.py b/lms/djangoapps/grades/tests/test_course_data.py
index 07a2e60397c9..8e30f1256c54 100644
--- a/lms/djangoapps/grades/tests/test_course_data.py
+++ b/lms/djangoapps/grades/tests/test_course_data.py
@@ -54,7 +54,7 @@ def test_fill_course_data(self, mock_get_blocks):
course_data = CourseData(self.user, **kwargs)
for arg in self.expected_results:
# No point validating the data we used as input, and c_b_s is input-only
- if arg != kwarg and arg != "collected_block_structure": # lint-amnesty, pylint: disable=consider-using-in
+ if arg != kwarg and arg != "collected_block_structure": # pylint: disable=consider-using-in
expected = self.expected_results[arg]
actual = getattr(course_data, arg)
if arg == 'course':
diff --git a/lms/djangoapps/grades/tests/test_services.py b/lms/djangoapps/grades/tests/test_services.py
index c82cbb0704b3..9b644e684ffc 100644
--- a/lms/djangoapps/grades/tests/test_services.py
+++ b/lms/djangoapps/grades/tests/test_services.py
@@ -120,7 +120,7 @@ def test_get_subsection_grade(self):
def test_get_subsection_grade_override(self):
override, _ = PersistentSubsectionGradeOverride.objects.update_or_create(grade=self.grade)
- self.assertDictEqual(self.subsection_grade_override_to_dict(self.service.get_subsection_grade_override( # noqa: PT009 # pylint: disable=line-too-long
+ self.assertDictEqual(self.subsection_grade_override_to_dict(self.service.get_subsection_grade_override( # noqa: PT009
user_id=self.user.id,
course_key_or_id=self.course.id,
usage_key_or_id=self.subsection.location
@@ -137,7 +137,7 @@ def test_get_subsection_grade_override(self):
)
# test with course key parameter as string instead
- self.assertDictEqual(self.subsection_grade_override_to_dict(self.service.get_subsection_grade_override( # noqa: PT009 # pylint: disable=line-too-long
+ self.assertDictEqual(self.subsection_grade_override_to_dict(self.service.get_subsection_grade_override( # noqa: PT009
user_id=self.user.id,
course_key_or_id=str(self.course.id),
usage_key_or_id=self.subsection.location
diff --git a/lms/djangoapps/grades/tests/test_tasks.py b/lms/djangoapps/grades/tests/test_tasks.py
index 26844863dea4..5c2082d4ee28 100644
--- a/lms/djangoapps/grades/tests/test_tasks.py
+++ b/lms/djangoapps/grades/tests/test_tasks.py
@@ -638,7 +638,7 @@ def test_recalculate_subsection_grade_v3(self, freeze_flag_value, end_date_adjus
CourseEnrollment.enroll(user, self.course.id)
with override_waffle_flag(self.freeze_grade_flag, active=freeze_flag_value):
- modified_datetime = datetime.utcnow().replace(tzinfo=pytz.UTC) - timedelta(days=1) # lint-amnesty, pylint: disable=unused-variable # noqa: F841
+ modified_datetime = datetime.utcnow().replace(tzinfo=pytz.UTC) - timedelta(days=1) # pylint: disable=unused-variable # noqa: F841
with patch('lms.djangoapps.grades.tasks._has_db_updated_with_new_score') as mock_has_db_updated:
result = recalculate_subsection_grade_v3.apply_async(kwargs=self.recalculate_subsection_grade_kwargs)
self._assert_for_freeze_grade_flag(
diff --git a/lms/djangoapps/instructor/access.py b/lms/djangoapps/instructor/access.py
index 775138ee63b6..b264d20d7538 100644
--- a/lms/djangoapps/instructor/access.py
+++ b/lms/djangoapps/instructor/access.py
@@ -127,7 +127,7 @@ def _change_access(course, user, level, action, send_email=True):
try:
role = ROLES[level](course.id)
except KeyError:
- raise ValueError(f"unrecognized level '{level}'") # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904
+ raise ValueError(f"unrecognized level '{level}'") # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904, E501
if action == 'allow':
if level == 'ccx_coach':
diff --git a/lms/djangoapps/instructor/enrollment.py b/lms/djangoapps/instructor/enrollment.py
index 2e37a696c4f2..37d9e4c8044b 100644
--- a/lms/djangoapps/instructor/enrollment.py
+++ b/lms/djangoapps/instructor/enrollment.py
@@ -22,7 +22,7 @@
from submissions.models import score_reset, score_set
from common.djangoapps.course_modes.models import CourseMode
-from common.djangoapps.student.models import ( # lint-amnesty, pylint: disable=line-too-long
+from common.djangoapps.student.models import (
CourseEnrollment,
CourseEnrollmentAllowed,
anonymous_id_for_user,
diff --git a/lms/djangoapps/instructor/settings/common.py b/lms/djangoapps/instructor/settings/common.py
index c8609d875014..784ebef04463 100644
--- a/lms/djangoapps/instructor/settings/common.py
+++ b/lms/djangoapps/instructor/settings/common.py
@@ -82,7 +82,7 @@ def plugin_settings(settings):
# .. toggle_tickets: https://github.com/openedx/edx-platform/pull/21260
settings.ENABLE_AUTOMATED_SIGNUPS_EXTRA_FIELDS = False
- # .. toggle_name: FEATURES['CERTIFICATES_INSTRUCTOR_GENERATION'] # lint-amnesty, pylint: disable=annotation-missing-token
+ # .. toggle_name: FEATURES['CERTIFICATES_INSTRUCTOR_GENERATION'] # pylint: disable=annotation-missing-token # noqa: E501
# .. toggle_implementation: DjangoSetting
# .. toggle_default: False
# .. toggle_description: Enable to allow batch generation of certificates from the instructor dashboard.
@@ -91,7 +91,7 @@ def plugin_settings(settings):
# .. toggle_use_cases: opt_in
settings.CERTIFICATES_INSTRUCTOR_GENERATION = False
- # .. toggle_name: FEATURES['ENABLE_CERTIFICATES_INSTRUCTOR_MANAGE] # lint-amnesty, pylint: disable=annotation-missing-token
+ # .. toggle_name: FEATURES['ENABLE_CERTIFICATES_INSTRUCTOR_MANAGE] # pylint: disable=annotation-missing-token # noqa: E501
# .. toggle_implementation: DjangoSetting
# .. toggle_default: False
# .. toggle_description: Allow course instructors to manage certificates from the instructor dashboard.
diff --git a/lms/djangoapps/instructor/tests/test_api.py b/lms/djangoapps/instructor/tests/test_api.py
index 869ea0235a1f..864189401734 100644
--- a/lms/djangoapps/instructor/tests/test_api.py
+++ b/lms/djangoapps/instructor/tests/test_api.py
@@ -361,7 +361,7 @@ def test_endpoints_accept_get(self, data):
f"Endpoint {data} returned status code 405 where it shouldn't, since it should allow GET."
-@patch('lms.djangoapps.bulk_email.models.html_to_text', Mock(return_value='Mocking CourseEmail.text_message', autospec=True)) # lint-amnesty, pylint: disable=line-too-long
+@patch('lms.djangoapps.bulk_email.models.html_to_text', Mock(return_value='Mocking CourseEmail.text_message', autospec=True)) # noqa: E501
class TestInstructorAPIDenyLevels(SharedModuleStoreTestCase, LoginEnrollmentTestCase):
"""
Ensure that users cannot access endpoints they shouldn't be able to.
@@ -820,7 +820,7 @@ def test_user_with_already_existing_email_in_csv(self):
assert response.status_code == 200
data = json.loads(response.content.decode('utf-8'))
warning_message = 'An account with email {email} exists but the provided username {username} ' \
- 'is different. Enrolling anyway with {email}.'.format(email='test_student@example.com', username='test_student_2') # lint-amnesty, pylint: disable=line-too-long
+ 'is different. Enrolling anyway with {email}.'.format(email='test_student@example.com', username='test_student_2') # noqa: E501
assert len(data['warnings']) != 0
assert data['warnings'][0]['response'] == warning_message
user = User.objects.get(email='test_student@example.com')
@@ -871,7 +871,7 @@ def test_user_with_already_existing_username_in_csv(self):
data = json.loads(response.content.decode('utf-8'))
assert len(data['row_errors']) != 0
assert data['row_errors'][0]['response'] == 'Username {user} already exists.'.format(user='test_student_1')
- # lint-amnesty, pylint: disable=line-too-long
+
def test_csv_file_not_attached(self):
"""
@@ -1093,7 +1093,7 @@ def test_bad_action(self):
def test_invalid_email(self):
url = reverse('students_update_enrollment', kwargs={'course_id': str(self.course.id)})
- response = self.client.post(url, {'identifiers': 'percivaloctavius@', 'action': 'enroll', 'email_students': False}) # lint-amnesty, pylint: disable=line-too-long
+ response = self.client.post(url, {'identifiers': 'percivaloctavius@', 'action': 'enroll', 'email_students': False}) # noqa: E501
assert response.status_code == 200
# test the response data
@@ -1295,7 +1295,7 @@ def test_enroll_with_email_not_registered(self, protocol):
assert register_url in html_body
for body in [text_body, html_body]:
- assert 'You have been invited to join {course} at edx.org by a member of the course staff.'.format( # noqa: UP032 # pylint: disable=line-too-long
+ assert 'You have been invited to join {course} at edx.org by a member of the course staff.'.format( # noqa: UP032
course=self.course.display_name
) in body
@@ -1333,7 +1333,7 @@ def test_enroll_email_not_registered_mktgsite(self, protocol):
assert 'Please finish your registration and fill' in html_body
for body in [text_body, html_body]:
- assert 'You have been invited to join {display_name} at edx.org by a member of the course staff.'.format( # noqa: UP032 # pylint: disable=line-too-long
+ assert 'You have been invited to join {display_name} at edx.org by a member of the course staff.'.format( # noqa: UP032
display_name=self.course.display_name
) in body
@@ -1384,7 +1384,7 @@ def test_enroll_with_email_not_registered_autoenroll(self, protocol):
assert register_url in html_body
for body in [text_body, html_body]:
- assert 'You have been invited to join {display_name} at edx.org by a member of the course staff.'.format( # noqa: UP032 # pylint: disable=line-too-long
+ assert 'You have been invited to join {display_name} at edx.org by a member of the course staff.'.format( # noqa: UP032
display_name=self.course.display_name
) in body
@@ -1492,7 +1492,7 @@ def test_unenroll_with_email(self):
assert text_body.startswith('Dear Enrolled Student')
for body in [text_body, html_body]:
- assert 'You have been unenrolled from {display_name} at edx.org by a member of the course staff.'.format( # noqa: UP032 # pylint: disable=line-too-long
+ assert 'You have been unenrolled from {display_name} at edx.org by a member of the course staff.'.format( # noqa: UP032
display_name=self.course.display_name,
) in body
@@ -1545,7 +1545,7 @@ def test_unenroll_with_email_allowed_student(self):
assert text_body.startswith('Dear Student,')
for body in [text_body, html_body]:
- assert 'You have been unenrolled from the course {display_name} by a member of the course staff.'.format( # noqa: UP032 # pylint: disable=line-too-long
+ assert 'You have been unenrolled from the course {display_name} by a member of the course staff.'.format( # noqa: UP032
display_name=self.course.display_name,
) in body
@@ -1582,7 +1582,7 @@ def test_enroll_with_email_not_registered_with_shib(self, protocol, mock_uses_sh
assert course_url in html_body
for body in [text_body, html_body]:
- assert 'You have been invited to join {display_name} at edx.org by a member of the course staff.'.format( # noqa: UP032 # pylint: disable=line-too-long
+ assert 'You have been invited to join {display_name} at edx.org by a member of the course staff.'.format( # noqa: UP032
display_name=self.course.display_name,
) in body
@@ -1607,7 +1607,7 @@ def test_enroll_email_not_registered_shib_mktgsite(self, mock_uses_shib):
assert text_body.startswith('Dear student,')
for body in [text_body, html_body]:
- assert 'You have been invited to join {display_name} at edx.org by a member of the course staff.'.format( # noqa: UP032 # pylint: disable=line-too-long
+ assert 'You have been invited to join {display_name} at edx.org by a member of the course staff.'.format( # noqa: UP032
display_name=self.course.display_name,
) in body
@@ -1642,7 +1642,7 @@ def test_enroll_with_email_not_registered_with_shib_autoenroll(self, protocol, m
assert 'To access this course click on the button below and login:' in html_body
for body in [text_body, html_body]:
- assert 'You have been invited to join {display_name} at edx.org by a member of the course staff.'.format( # noqa: UP032 # pylint: disable=line-too-long
+ assert 'You have been invited to join {display_name} at edx.org by a member of the course staff.'.format( # noqa: UP032
display_name=self.course.display_name,
) in body
@@ -1972,25 +1972,25 @@ def add_notenrolled(self, response, identifier):
def test_add_notenrolled_email(self):
url = reverse('bulk_beta_modify_access', kwargs={'course_id': str(self.course.id)})
- response = self.client.post(url, {'identifiers': self.notenrolled_student.email, 'action': 'add', 'email_students': False}) # lint-amnesty, pylint: disable=line-too-long
+ response = self.client.post(url, {'identifiers': self.notenrolled_student.email, 'action': 'add', 'email_students': False}) # noqa: E501
self.add_notenrolled(response, self.notenrolled_student.email)
assert not CourseEnrollment.is_enrolled(self.notenrolled_student, self.course.id)
def test_add_notenrolled_email_autoenroll(self):
url = reverse('bulk_beta_modify_access', kwargs={'course_id': str(self.course.id)})
- response = self.client.post(url, {'identifiers': self.notenrolled_student.email, 'action': 'add', 'email_students': False, 'auto_enroll': True}) # lint-amnesty, pylint: disable=line-too-long
+ response = self.client.post(url, {'identifiers': self.notenrolled_student.email, 'action': 'add', 'email_students': False, 'auto_enroll': True}) # noqa: E501
self.add_notenrolled(response, self.notenrolled_student.email)
assert CourseEnrollment.is_enrolled(self.notenrolled_student, self.course.id)
def test_add_notenrolled_username(self):
url = reverse('bulk_beta_modify_access', kwargs={'course_id': str(self.course.id)})
- response = self.client.post(url, {'identifiers': self.notenrolled_student.username, 'action': 'add', 'email_students': False}) # lint-amnesty, pylint: disable=line-too-long
+ response = self.client.post(url, {'identifiers': self.notenrolled_student.username, 'action': 'add', 'email_students': False}) # noqa: E501
self.add_notenrolled(response, self.notenrolled_student.username)
assert not CourseEnrollment.is_enrolled(self.notenrolled_student, self.course.id)
def test_add_notenrolled_username_autoenroll(self):
url = reverse('bulk_beta_modify_access', kwargs={'course_id': str(self.course.id)})
- response = self.client.post(url, {'identifiers': self.notenrolled_student.username, 'action': 'add', 'email_students': False, 'auto_enroll': True}) # lint-amnesty, pylint: disable=line-too-long
+ response = self.client.post(url, {'identifiers': self.notenrolled_student.username, 'action': 'add', 'email_students': False, 'auto_enroll': True}) # noqa: E501
self.add_notenrolled(response, self.notenrolled_student.username)
assert CourseEnrollment.is_enrolled(self.notenrolled_student, self.course.id)
@@ -2000,7 +2000,7 @@ def test_add_notenrolled_username_autoenroll_with_multiple_users(self):
f"sit@amet.consectetur\nadipiscing@elit.Aenean\r convallis@at.lacus\r, ut@lacinia.Sed, "
f"{self.notenrolled_student.username}"
)
- response = self.client.post(url, {'identifiers': identifiers, 'action': 'add', 'email_students': False, 'auto_enroll': True}) # lint-amnesty, pylint: disable=line-too-long
+ response = self.client.post(url, {'identifiers': identifiers, 'action': 'add', 'email_students': False, 'auto_enroll': True}) # noqa: E501
assert 6, len(json.loads(response.content.decode())['results'])
@ddt.data('http', 'https')
@@ -2111,7 +2111,7 @@ def test_add_notenrolled_with_email_autoenroll(self, protocol):
def test_add_notenrolled_email_mktgsite(self):
# Try with marketing site enabled
url = reverse('bulk_beta_modify_access', kwargs={'course_id': str(self.course.id)})
- response = self.client.post(url, {'identifiers': self.notenrolled_student.email, 'action': 'add', 'email_students': True}) # lint-amnesty, pylint: disable=line-too-long
+ response = self.client.post(url, {'identifiers': self.notenrolled_student.email, 'action': 'add', 'email_students': True}) # noqa: E501
assert response.status_code == 200
@@ -3683,7 +3683,7 @@ def test_skip_entrance_exam_student(self):
self.assertContains(response, message)
-@patch('lms.djangoapps.bulk_email.models.html_to_text', Mock(return_value='Mocking CourseEmail.text_message', autospec=True)) # lint-amnesty, pylint: disable=line-too-long
+@patch('lms.djangoapps.bulk_email.models.html_to_text', Mock(return_value='Mocking CourseEmail.text_message', autospec=True)) # noqa: E501
class TestInstructorSendEmail(SiteMixin, SharedModuleStoreTestCase, LoginEnrollmentTestCase):
"""
Checks that only instructors have access to email endpoints, and that
diff --git a/lms/djangoapps/instructor/tests/test_api_v2.py b/lms/djangoapps/instructor/tests/test_api_v2.py
index 4a7853671caf..d6ede5607a3c 100644
--- a/lms/djangoapps/instructor/tests/test_api_v2.py
+++ b/lms/djangoapps/instructor/tests/test_api_v2.py
@@ -599,7 +599,7 @@ def test_tabs_log_warning_when_mfe_url_not_set(self):
)
# Tab URLs should use empty string as base, not "None"
for tab in tabs:
- self.assertFalse(tab['url'].startswith('None'), f"Tab URL should not start with 'None': {tab['url']}") # noqa: PT009 # pylint: disable=line-too-long
+ self.assertFalse(tab['url'].startswith('None'), f"Tab URL should not start with 'None': {tab['url']}") # noqa: PT009
self.assertTrue( # noqa: PT009
tab['url'].startswith(f'/{self.course.id}/'),
f"Tab URL should start with '/{self.course.id}/': {tab['url']}"
@@ -663,7 +663,7 @@ def test_logs_warning_and_returns_relative_url_when_setting_is_none(self):
'COMMUNICATIONS_MICROFRONTEND_URL', 'courses', 'course-v1:edX+DemoX+Demo', 'bulk_email'
)
- self.assertTrue(any('COMMUNICATIONS_MICROFRONTEND_URL is not configured' in msg for msg in cm.output)) # noqa: PT009 # pylint: disable=line-too-long
+ self.assertTrue(any('COMMUNICATIONS_MICROFRONTEND_URL is not configured' in msg for msg in cm.output)) # noqa: PT009
self.assertFalse(result.startswith('None')) # noqa: PT009
self.assertEqual(result, '/courses/course-v1:edX+DemoX+Demo/bulk_email') # noqa: PT009
@@ -681,7 +681,7 @@ def test_base_with_subpath_and_trailing_slash(self):
result = self._build(
"COMMUNICATIONS_MICROFRONTEND_URL", "courses", "course-v1:edX+DemoX+Demo", "bulk_email", strip_url=False
)
- self.assertEqual(result, 'http://localhost:1984/communications/courses/course-v1:edX+DemoX+Demo/bulk_email') # noqa: PT009 # pylint: disable=line-too-long
+ self.assertEqual(result, 'http://localhost:1984/communications/courses/course-v1:edX+DemoX+Demo/bulk_email') # noqa: PT009
@ddt.ddt
@@ -766,7 +766,7 @@ def test_get_instructor_tasks_unauthorized(self):
response = self.client.get(self._get_url())
self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN) # noqa: PT009
- self.assertIn('You do not have permission to perform this action.', response.data['developer_message']) # noqa: PT009 # pylint: disable=line-too-long
+ self.assertIn('You do not have permission to perform this action.', response.data['developer_message']) # noqa: PT009
def test_get_instructor_tasks_unauthenticated(self):
"""
@@ -784,7 +784,7 @@ def test_get_instructor_tasks_nonexistent_course(self):
response = self.client.get(self._get_url(course_id=nonexistent_course_id))
self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND) # noqa: PT009
- self.assertEqual('Course not found: course-v1:edX+NonExistent+2024.', response.data['developer_message']) # noqa: PT009 # pylint: disable=line-too-long
+ self.assertEqual('Course not found: course-v1:edX+NonExistent+2024.', response.data['developer_message']) # noqa: PT009
def test_filter_by_problem_location(self):
"""
@@ -1086,7 +1086,7 @@ def test_get_graded_subsections_with_mocked_units(self, mock_get_units):
items = response_data['items']
self.assertEqual(len(items), 1) # noqa: PT009
self.assertEqual(items[0]['display_name'], 'Mocked Assignment') # noqa: PT009
- self.assertEqual(items[0]['subsection_id'], 'block-v1:Test+Course+2024+type@sequential+block@mock') # noqa: PT009 # pylint: disable=line-too-long
+ self.assertEqual(items[0]['subsection_id'], 'block-v1:Test+Course+2024+type@sequential+block@mock') # noqa: PT009
@patch('lms.djangoapps.instructor.views.api_v2.title_or_url')
@patch('lms.djangoapps.instructor.views.api_v2.get_units_with_due_date')
@@ -1108,8 +1108,8 @@ def test_get_graded_subsections_title_fallback(self, mock_get_units, mock_title_
response_data = json.loads(response.content)
items = response_data['items']
self.assertEqual(len(items), 1) # noqa: PT009
- self.assertEqual(items[0]['display_name'], 'block-v1:Test+Course+2024+type@sequential+block@fallback') # noqa: PT009 # pylint: disable=line-too-long
- self.assertEqual(items[0]['subsection_id'], 'block-v1:Test+Course+2024+type@sequential+block@fallback') # noqa: PT009 # pylint: disable=line-too-long
+ self.assertEqual(items[0]['display_name'], 'block-v1:Test+Course+2024+type@sequential+block@fallback') # noqa: PT009
+ self.assertEqual(items[0]['subsection_id'], 'block-v1:Test+Course+2024+type@sequential+block@fallback') # noqa: PT009
def test_get_graded_subsections_response_format(self):
"""
@@ -1603,7 +1603,7 @@ def test_get_unit_extensions(self):
self.assertIn('Robot', extension['full_name']) # noqa: PT009
self.assertEqual(extension['email'], 'student1@example.com') # noqa: PT009
self.assertEqual(extension['unit_title'], 'Homework 1') # Should be the top-level unit # noqa: PT009
- self.assertEqual(extension['unit_location'], 'block-v1:edX+TestX+Test_Course+type@sequential+block@Homework_1') # noqa: PT009 # pylint: disable=line-too-long
+ self.assertEqual(extension['unit_location'], 'block-v1:edX+TestX+Test_Course+type@sequential+block@Homework_1') # noqa: PT009
self.assertEqual(extension['extended_due_date'], '2025-10-31T23:59:59Z') # noqa: PT009
# Student 2's extension
@@ -1612,7 +1612,7 @@ def test_get_unit_extensions(self):
self.assertIn('Robot', extension['full_name']) # noqa: PT009
self.assertEqual(extension['email'], 'student2@example.com') # noqa: PT009
self.assertEqual(extension['unit_title'], 'Homework 1') # Should be the top-level unit # noqa: PT009
- self.assertEqual(extension['unit_location'], 'block-v1:edX+TestX+Test_Course+type@sequential+block@Homework_1') # noqa: PT009 # pylint: disable=line-too-long
+ self.assertEqual(extension['unit_location'], 'block-v1:edX+TestX+Test_Course+type@sequential+block@Homework_1') # noqa: PT009
self.assertEqual(extension['extended_due_date'], '2025-12-31T23:59:59Z') # noqa: PT009
@ddt.data(
diff --git a/lms/djangoapps/instructor/tests/test_certificates.py b/lms/djangoapps/instructor/tests/test_certificates.py
index 170d4f9fb89a..417bd4bdf89f 100644
--- a/lms/djangoapps/instructor/tests/test_certificates.py
+++ b/lms/djangoapps/instructor/tests/test_certificates.py
@@ -1285,7 +1285,7 @@ def test_no_generated_certificate_error(self):
assert response.status_code == 400
res_json = json.loads(response.content.decode('utf-8'))
# Assert Error Message
- assert res_json['message'] == f'The student {self.enrolled_user_2.username} does not have certificate for the course {self.course.number}. Kindly verify student username/email and the selected course are correct and try again.' # pylint: disable=line-too-long
+ assert res_json['message'] == f'The student {self.enrolled_user_2.username} does not have certificate for the course {self.course.number}. Kindly verify student username/email and the selected course are correct and try again.' # noqa: E501
def test_certificate_already_invalid_error(self):
"""
@@ -1305,7 +1305,7 @@ def test_certificate_already_invalid_error(self):
res_json = json.loads(response.content.decode('utf-8'))
# Assert Error Message
- assert res_json['message'] == f'Certificate for student {self.enrolled_user_1.username} is already invalid, kindly verify that certificate was generated for this student and then proceed.' # pylint: disable=line-too-long
+ assert res_json['message'] == f'Certificate for student {self.enrolled_user_1.username} is already invalid, kindly verify that certificate was generated for this student and then proceed.' # noqa: E501
def test_duplicate_certificate_invalidation_error(self):
"""
@@ -1329,7 +1329,7 @@ def test_duplicate_certificate_invalidation_error(self):
res_json = json.loads(response.content.decode('utf-8'))
# Assert Error Message
- assert res_json['message'] == f'Certificate of {self.enrolled_user_1.username} has already been invalidated. Please check your spelling and retry.' # pylint: disable=line-too-long
+ assert res_json['message'] == f'Certificate of {self.enrolled_user_1.username} has already been invalidated. Please check your spelling and retry.' # noqa: E501
def test_remove_certificate_invalidation(self):
"""
diff --git a/lms/djangoapps/instructor/tests/test_proctoring.py b/lms/djangoapps/instructor/tests/test_proctoring.py
index 8df3f64bfe08..16398db3dd6d 100644
--- a/lms/djangoapps/instructor/tests/test_proctoring.py
+++ b/lms/djangoapps/instructor/tests/test_proctoring.py
@@ -35,7 +35,7 @@ class TestProctoringDashboardViews(SharedModuleStoreTestCase):
@classmethod
def setUpClass(cls):
super().setUpClass()
- button = 'Special Exams ' # lint-amnesty, pylint: disable=line-too-long
+ button = 'Special Exams ' # noqa: E501
cls.proctoring_link = button
def setUp(self):
@@ -49,13 +49,13 @@ def setup_course_url(self, course):
"""
Create URL for instructor dashboard
"""
- self.url = reverse('instructor_dashboard', kwargs={'course_id': str(course.id)}) # lint-amnesty, pylint: disable=attribute-defined-outside-init
+ self.url = reverse('instructor_dashboard', kwargs={'course_id': str(course.id)}) # pylint: disable=attribute-defined-outside-init
def setup_course(self, enable_proctored_exams, enable_timed_exams):
"""
Create course based on proctored exams and timed exams values
"""
- self.course = CourseFactory.create(enable_proctored_exams=enable_proctored_exams, # lint-amnesty, pylint: disable=attribute-defined-outside-init
+ self.course = CourseFactory.create(enable_proctored_exams=enable_proctored_exams, # pylint: disable=attribute-defined-outside-init
enable_timed_exams=enable_timed_exams)
self.setup_course_url(self.course)
diff --git a/lms/djangoapps/instructor/views/api.py b/lms/djangoapps/instructor/views/api.py
index 339d3530627f..ea4b6e99e9bb 100644
--- a/lms/djangoapps/instructor/views/api.py
+++ b/lms/djangoapps/instructor/views/api.py
@@ -514,7 +514,7 @@ def post(self, request, course_id): # pylint: disable=too-many-statements
'email': email,
'response': _('Invalid email {email_address}.').format(email_address=email),
})
- log.warning('Email address %s is associated with a retired user, so course enrollment was ' + # lint-amnesty, pylint: disable=logging-not-lazy
+ log.warning('Email address %s is associated with a retired user, so course enrollment was ' + # pylint: disable=logging-not-lazy
'blocked.', email)
else:
# This email does not yet exist, so we need to create a new account
@@ -1689,7 +1689,7 @@ def post(self, request, course_id, csv=False): # pylint: disable=redefined-oute
)
success_status = SUCCESS_MESSAGE_TEMPLATE.format(report_type=report_type)
except Exception as e:
- raise self.api_error(status.HTTP_400_BAD_REQUEST, str(e), 'Requested task is already running') # noqa: B904 # pylint: disable=line-too-long
+ raise self.api_error(status.HTTP_400_BAD_REQUEST, str(e), 'Requested task is already running') # noqa: B904
return JsonResponse({"status": success_status})
@@ -2870,7 +2870,7 @@ def get(self, request, course_id):
problem responses report for an entire course might be called:
edX_DemoX_Demo_Course_student_state_from_block-v1_edX+DemoX+Demo_Course+type@course+block@course_2021-04-30-0918.csv
- """ # pylint: disable=line-too-long
+ """
return _list_report_downloads(request=request, course_id=course_id)
@@ -4007,7 +4007,7 @@ def parse_request_data(request):
try:
data = json.loads(request.body.decode('utf8') or '{}')
except ValueError:
- raise ValueError(_('The record is not in the correct format. Please add a valid username or email address.')) # lint-amnesty, pylint: disable=raise-missing-from,line-too-long # noqa: B904
+ raise ValueError(_('The record is not in the correct format. Please add a valid username or email address.')) # pylint: disable=raise-missing-from # noqa: B904
return data
@@ -4024,7 +4024,7 @@ def get_student(username_or_email):
try:
student = get_user_by_username_or_email(username_or_email)
except ObjectDoesNotExist:
- raise ValueError(_("{user} does not exist in the LMS. Please check your spelling and retry.").format( # lint-amnesty, pylint: disable=raise-missing-from,line-too-long # noqa: B904
+ raise ValueError(_("{user} does not exist in the LMS. Please check your spelling and retry.").format( # pylint: disable=raise-missing-from # noqa: B904
user=username_or_email
))
@@ -4343,7 +4343,7 @@ def re_validate_certificate(request, course_key, generated_certificate, student)
certificate_invalidation = certs_api.get_certificate_invalidation_entry(generated_certificate)
if not certificate_invalidation:
- raise ValueError(_("Certificate Invalidation does not exist, Please refresh the page and try again.")) # lint-amnesty, pylint: disable=raise-missing-from
+ raise ValueError(_("Certificate Invalidation does not exist, Please refresh the page and try again.")) # pylint: disable=raise-missing-from
certificate_invalidation.deactivate()
diff --git a/lms/djangoapps/instructor/views/instructor_dashboard.py b/lms/djangoapps/instructor/views/instructor_dashboard.py
index 8a090e943bef..3f0d89bac3bd 100644
--- a/lms/djangoapps/instructor/views/instructor_dashboard.py
+++ b/lms/djangoapps/instructor/views/instructor_dashboard.py
@@ -684,7 +684,7 @@ def _section_data_download(course, access):
'list_report_downloads_url': reverse('list_report_downloads', kwargs={'course_id': str(course_key)}),
'calculate_grades_csv_url': reverse('calculate_grades_csv', kwargs={'course_id': str(course_key)}),
'problem_grade_report_url': reverse('problem_grade_report', kwargs={'course_id': str(course_key)}),
- 'course_has_survey': True if course.course_survey_name else False, # lint-amnesty, pylint: disable=simplifiable-if-expression
+ 'course_has_survey': True if course.course_survey_name else False, # pylint: disable=simplifiable-if-expression
'course_survey_results_url': reverse(
'get_course_survey_results', kwargs={'course_id': str(course_key)}
),
diff --git a/lms/djangoapps/instructor/views/tools.py b/lms/djangoapps/instructor/views/tools.py
index 2cadf7bdbdec..c288f2b6bdfe 100644
--- a/lms/djangoapps/instructor/views/tools.py
+++ b/lms/djangoapps/instructor/views/tools.py
@@ -90,7 +90,7 @@ def parse_datetime(datestr):
try:
return dateutil.parser.parse(datestr).replace(tzinfo=UTC)
except ValueError:
- raise DashboardError(_("Unable to parse date: ") + datestr) # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904
+ raise DashboardError(_("Unable to parse date: ") + datestr) # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904, E501
def find_unit(course, url):
diff --git a/lms/djangoapps/instructor_analytics/basic.py b/lms/djangoapps/instructor_analytics/basic.py
index 34581d373e5e..18d93e40d774 100644
--- a/lms/djangoapps/instructor_analytics/basic.py
+++ b/lms/djangoapps/instructor_analytics/basic.py
@@ -598,7 +598,7 @@ def extract_course_registration(registration_code, features, csv_type):
site_name = configuration_helpers.get_value('SITE_NAME', settings.SITE_NAME)
registration_features = [x for x in COURSE_REGISTRATION_FEATURES if x in features]
- course_registration_dict = {feature: getattr(registration_code, feature) for feature in registration_features} # lint-amnesty, pylint: disable=line-too-long
+ course_registration_dict = {feature: getattr(registration_code, feature) for feature in registration_features}
course_registration_dict['company_name'] = None
if registration_code.invoice_item:
course_registration_dict['company_name'] = registration_code.invoice_item.invoice.company_name
diff --git a/lms/djangoapps/instructor_task/config/waffle.py b/lms/djangoapps/instructor_task/config/waffle.py
index e142e6bd3292..98f7dc6e6b18 100644
--- a/lms/djangoapps/instructor_task/config/waffle.py
+++ b/lms/djangoapps/instructor_task/config/waffle.py
@@ -8,11 +8,11 @@
WAFFLE_NAMESPACE = 'instructor_task'
# Course override flags
-GENERATE_PROBLEM_GRADE_REPORT_VERIFIED_ONLY = CourseWaffleFlag( # lint-amnesty, pylint: disable=toggle-missing-annotation
+GENERATE_PROBLEM_GRADE_REPORT_VERIFIED_ONLY = CourseWaffleFlag( # pylint: disable=toggle-missing-annotation
f'{WAFFLE_NAMESPACE}.generate_problem_grade_report_verified_only', __name__
)
-GENERATE_COURSE_GRADE_REPORT_VERIFIED_ONLY = CourseWaffleFlag( # lint-amnesty, pylint: disable=toggle-missing-annotation
+GENERATE_COURSE_GRADE_REPORT_VERIFIED_ONLY = CourseWaffleFlag( # pylint: disable=toggle-missing-annotation
f'{WAFFLE_NAMESPACE}.generate_course_grade_report_verified_only', __name__
)
diff --git a/lms/djangoapps/instructor_task/management/commands/fail_old_tasks.py b/lms/djangoapps/instructor_task/management/commands/fail_old_tasks.py
index ffd5afbd14ac..b58c4684cfad 100644
--- a/lms/djangoapps/instructor_task/management/commands/fail_old_tasks.py
+++ b/lms/djangoapps/instructor_task/management/commands/fail_old_tasks.py
@@ -96,7 +96,7 @@ def handle(self, *args, **options):
for task in tasks:
print(
- "{task_state} task '{task_id}', of type '{task_type}', created on '{created}', will be marked as 'FAILURE'".format( # lint-amnesty, pylint: disable=line-too-long # noqa: UP032
+ "{task_state} task '{task_id}', of type '{task_type}', created on '{created}', will be marked as 'FAILURE'".format( # noqa: E501, UP032
task_state=task.task_state,
task_id=task.task_id,
task_type=task.task_type,
diff --git a/lms/djangoapps/instructor_task/models.py b/lms/djangoapps/instructor_task/models.py
index 6a4df7e32760..9aebd8d1c232 100644
--- a/lms/djangoapps/instructor_task/models.py
+++ b/lms/djangoapps/instructor_task/models.py
@@ -74,7 +74,7 @@ class Meta:
task_key = models.CharField(max_length=255, db_index=True)
task_input = models.TextField()
task_id = models.CharField(max_length=255, db_index=True) # max_length from celery_taskmeta
- task_state = models.CharField(max_length=50, null=True, db_index=True) # max_length from celery_taskmeta # noqa: DJ001 # pylint: disable=line-too-long
+ task_state = models.CharField(max_length=50, null=True, db_index=True) # max_length from celery_taskmeta # noqa: DJ001, E501
task_output = models.CharField(max_length=1024, null=True) # noqa: DJ001
requester = models.ForeignKey(User, db_index=True, on_delete=models.CASCADE)
created = models.DateTimeField(auto_now_add=True, null=True)
diff --git a/lms/djangoapps/instructor_task/subtasks.py b/lms/djangoapps/instructor_task/subtasks.py
index fb2a06150941..5d790a78e279 100644
--- a/lms/djangoapps/instructor_task/subtasks.py
+++ b/lms/djangoapps/instructor_task/subtasks.py
@@ -116,7 +116,7 @@ def _generate_items_for_subtask(
# more items than items_per_task allows. We expect this to be a small enough
# number as to be negligible.
if num_items_queued != total_num_items:
- TASK_LOG.info("Number of items generated by chunking %s not equal to original total %s", num_items_queued, total_num_items) # lint-amnesty, pylint: disable=line-too-long
+ TASK_LOG.info("Number of items generated by chunking %s not equal to original total %s", num_items_queued, total_num_items) # noqa: E501
class SubtaskStatus:
@@ -144,7 +144,7 @@ class SubtaskStatus:
Also, we should count up "not attempted" separately from attempted/failed.
"""
- def __init__(self, task_id, attempted=None, succeeded=0, failed=0, skipped=0, retried_nomax=0, retried_withmax=0, state=None): # lint-amnesty, pylint: disable=line-too-long
+ def __init__(self, task_id, attempted=None, succeeded=0, failed=0, skipped=0, retried_nomax=0, retried_withmax=0, state=None): # noqa: E501
"""Construct a SubtaskStatus object."""
self.task_id = task_id
if attempted is not None:
@@ -417,7 +417,7 @@ def check_subtask_is_valid(entry_id, current_task_id, new_subtask_status):
subtask_dict = json.loads(entry.subtasks)
subtask_status_info = subtask_dict['status']
if current_task_id not in subtask_status_info:
- format_str = "Unexpected task_id '{}': unable to find status for subtask of instructor task '{}': rejecting task {}" # lint-amnesty, pylint: disable=line-too-long
+ format_str = "Unexpected task_id '{}': unable to find status for subtask of instructor task '{}': rejecting task {}" # noqa: E501
msg = format_str.format(current_task_id, entry, new_subtask_status)
TASK_LOG.warning(msg)
raise DuplicateTaskException(msg)
@@ -427,7 +427,7 @@ def check_subtask_is_valid(entry_id, current_task_id, new_subtask_status):
subtask_status = SubtaskStatus.from_dict(subtask_status_info[current_task_id])
subtask_state = subtask_status.state
if subtask_state in READY_STATES:
- format_str = "Unexpected task_id '{}': already completed - status {} for subtask of instructor task '{}': rejecting task {}" # lint-amnesty, pylint: disable=line-too-long
+ format_str = "Unexpected task_id '{}': already completed - status {} for subtask of instructor task '{}': rejecting task {}" # noqa: E501
msg = format_str.format(current_task_id, subtask_status, entry, new_subtask_status)
TASK_LOG.warning(msg)
raise DuplicateTaskException(msg)
@@ -440,7 +440,7 @@ def check_subtask_is_valid(entry_id, current_task_id, new_subtask_status):
new_retry_count = new_subtask_status.get_retry_count()
current_retry_count = subtask_status.get_retry_count()
if new_retry_count < current_retry_count:
- format_str = "Unexpected task_id '{}': already retried - status {} for subtask of instructor task '{}': rejecting task {}" # lint-amnesty, pylint: disable=line-too-long
+ format_str = "Unexpected task_id '{}': already retried - status {} for subtask of instructor task '{}': rejecting task {}" # noqa: E501
msg = format_str.format(current_task_id, subtask_status, entry, new_subtask_status)
TASK_LOG.warning(msg)
raise DuplicateTaskException(msg)
@@ -477,7 +477,7 @@ def update_subtask_status(entry_id, current_task_id, new_subtask_status, retry_c
current_task_id, entry_id, new_subtask_status, retry_count)
update_subtask_status(entry_id, current_task_id, new_subtask_status, retry_count)
else:
- TASK_LOG.info("Failed to update status after %d retries for subtask %s of instructor task %d with status %s", # lint-amnesty, pylint: disable=line-too-long
+ TASK_LOG.info("Failed to update status after %d retries for subtask %s of instructor task %d with status %s", # noqa: E501
retry_count, current_task_id, entry_id, new_subtask_status)
raise
finally:
diff --git a/lms/djangoapps/instructor_task/tasks_helper/misc.py b/lms/djangoapps/instructor_task/tasks_helper/misc.py
index 86f7ed873014..6eb4fd5f6907 100644
--- a/lms/djangoapps/instructor_task/tasks_helper/misc.py
+++ b/lms/djangoapps/instructor_task/tasks_helper/misc.py
@@ -159,7 +159,7 @@ def _get_csv_file_content(csv_file):
return csv_content
-def cohort_students_and_upload(_xblock_instance_args, _entry_id, course_id, task_input, action_name): # lint-amnesty, pylint: disable=too-many-statements
+def cohort_students_and_upload(_xblock_instance_args, _entry_id, course_id, task_input, action_name): # pylint: disable=too-many-statements
"""
Within a given course, cohort students in bulk, then upload the results
using a `ReportStore`.
@@ -221,7 +221,7 @@ def cohort_students_and_upload(_xblock_instance_args, _entry_id, course_id, task
try:
# If add_user_to_cohort successfully adds a user, a user object is returned.
# If a user is preassigned to a cohort, no user object is returned (we already have the email address).
- (user, previous_cohort, preassigned) = add_user_to_cohort(cohorts_status[cohort_name]['cohort'], username_or_email) # lint-amnesty, pylint: disable=line-too-long, unused-variable
+ (user, previous_cohort, preassigned) = add_user_to_cohort(cohorts_status[cohort_name]['cohort'], username_or_email) # pylint: disable=unused-variable # noqa: E501
if preassigned:
cohorts_status[cohort_name]['Preassigned Learners'].add(username_or_email)
task_progress.preassigned += 1
@@ -249,10 +249,10 @@ def cohort_students_and_upload(_xblock_instance_args, _entry_id, course_id, task
task_progress.update_task_state(extra_meta=current_step)
# Filter the output of `add_users_to_cohorts` in order to upload the result.
- output_header = ['Cohort Name', 'Exists', 'Learners Added', 'Learners Not Found', 'Invalid Email Addresses', 'Preassigned Learners'] # lint-amnesty, pylint: disable=line-too-long
+ output_header = ['Cohort Name', 'Exists', 'Learners Added', 'Learners Not Found', 'Invalid Email Addresses', 'Preassigned Learners'] # noqa: E501
output_rows = [
[
- ','.join(status_dict.get(column_name, '')) if (column_name == 'Learners Not Found' # lint-amnesty, pylint: disable=consider-using-in
+ ','.join(status_dict.get(column_name, '')) if (column_name == 'Learners Not Found' # pylint: disable=consider-using-in
or column_name == 'Invalid Email Addresses'
or column_name == 'Preassigned Learners')
else status_dict[column_name]
@@ -459,7 +459,7 @@ def upload_ora2_submission_files(
'Failed to upload zip file to storage.',
'Error while uploading zip file to storage',
):
- zip_filename = upload_zip_to_report_store(zip_file, 'submission_files', course_id, start_date), # lint-amnesty, pylint: disable=trailing-comma-tuple
+ zip_filename = upload_zip_to_report_store(zip_file, 'submission_files', course_id, start_date), # pylint: disable=trailing-comma-tuple
if not zip_filename:
TASK_LOG.info('%s, zip_filename is None, aborting.', task_info_string)
@@ -475,7 +475,7 @@ def upload_ora2_submission_files(
return UPDATE_STATUS_SUCCEEDED
-def generate_anonymous_ids(_xblock_instance_args, _entry_id, course_id, task_input, action_name): # lint-amnesty, pylint: disable=too-many-statements
+def generate_anonymous_ids(_xblock_instance_args, _entry_id, course_id, task_input, action_name): # pylint: disable=too-many-statements
"""
Generate a 2-column CSV output of user-id, anonymized-user-id
"""
diff --git a/lms/djangoapps/instructor_task/tasks_helper/module_state.py b/lms/djangoapps/instructor_task/tasks_helper/module_state.py
index 00fc99f5b03f..f2914518e1ab 100644
--- a/lms/djangoapps/instructor_task/tasks_helper/module_state.py
+++ b/lms/djangoapps/instructor_task/tasks_helper/module_state.py
@@ -251,7 +251,7 @@ def override_score_module_state(xblock_instance_args, block, student_module, tas
raise UpdateProblemModuleStateError(msg)
weighted_override_score = float(task_input['score'])
- if not (0 <= weighted_override_score <= instance.max_score()): # lint-amnesty, pylint: disable=superfluous-parens
+ if not (0 <= weighted_override_score <= instance.max_score()): # pylint: disable=superfluous-parens
msg = "Score must be between 0 and the maximum points available for the problem."
raise UpdateProblemModuleStateError(msg)
diff --git a/lms/djangoapps/instructor_task/tests/test_api.py b/lms/djangoapps/instructor_task/tests/test_api.py
index f1df593f7f20..593c6fbd7ae0 100644
--- a/lms/djangoapps/instructor_task/tests/test_api.py
+++ b/lms/djangoapps/instructor_task/tests/test_api.py
@@ -222,7 +222,7 @@ def test_submit_task(self, task_function, expected_task_type, params=None):
task_function(self.create_task_request(self.instructor), location, **params)
-@patch('lms.djangoapps.bulk_email.models.html_to_text', Mock(return_value='Mocking CourseEmail.text_message', autospec=True)) # lint-amnesty, pylint: disable=line-too-long
+@patch('lms.djangoapps.bulk_email.models.html_to_text', Mock(return_value='Mocking CourseEmail.text_message', autospec=True)) # noqa: E501
class InstructorTaskCourseSubmitTest(TestReportMixin, InstructorTaskCourseTestCase):
"""Tests API methods that involve the submission of course-based background tasks."""
diff --git a/lms/djangoapps/instructor_task/tests/test_integration.py b/lms/djangoapps/instructor_task/tests/test_integration.py
index 70f649da5233..c7dfde43463f 100644
--- a/lms/djangoapps/instructor_task/tests/test_integration.py
+++ b/lms/djangoapps/instructor_task/tests/test_integration.py
@@ -377,7 +377,7 @@ def check_func(expect, answer_given):
InstructorTaskModuleTestCase.problem_location(problem_url_name)
)
block.data = problem_xml
- with self.module_store.branch_setting(ModuleStoreEnum.Branch.draft_preferred, block.location.course_key): # lint-amnesty, pylint: disable=line-too-long
+ with self.module_store.branch_setting(ModuleStoreEnum.Branch.draft_preferred, block.location.course_key):
self.module_store.update_item(block, self.user.id)
self.module_store.publish(block.location, self.user.id)
else:
@@ -609,7 +609,7 @@ def merge_dicts(*dicts):
Arguments:
dicts: tuple of dicts
"""
- return dict([item for d in dicts for item in d.items()]) # lint-amnesty, pylint: disable=consider-using-dict-comprehension
+ return dict([item for d in dicts for item in d.items()]) # pylint: disable=consider-using-dict-comprehension
def user_partition_group(user):
"""Return a dict having single key with value equals to students group in partition"""
diff --git a/lms/djangoapps/instructor_task/tests/test_tasks.py b/lms/djangoapps/instructor_task/tests/test_tasks.py
index 051503da6261..1ea5d32b107d 100644
--- a/lms/djangoapps/instructor_task/tests/test_tasks.py
+++ b/lms/djangoapps/instructor_task/tests/test_tasks.py
@@ -334,7 +334,7 @@ def test_overriding_success(self):
Tests score override for a problem in a course, for all students succeeds.
"""
mock_instance = MagicMock()
- getattr(mock_instance, 'override_problem_score').return_value = None # lint-amnesty, pylint: disable=literal-used-as-attribute # noqa: B009
+ getattr(mock_instance, 'override_problem_score').return_value = None # lint-amnesty, pylint: disable=literal-used-as-attribute # noqa: B009, E501
num_students = 10
self._create_students_with_state(num_students)
@@ -427,7 +427,7 @@ def test_rescoring_unrescorable(self):
mock_instance = MagicMock()
del mock_instance.rescore_problem
del mock_instance.rescore
- with patch('lms.djangoapps.instructor_task.tasks_helper.module_state.get_block_for_descriptor') as mock_get_block: # lint-amnesty, pylint: disable=line-too-long
+ with patch('lms.djangoapps.instructor_task.tasks_helper.module_state.get_block_for_descriptor') as mock_get_block: # noqa: E501
mock_get_block.return_value = mock_instance
with pytest.raises(UpdateProblemModuleStateError):
self._run_task_with_mock_celery(rescore_problem, task_entry.id, task_entry.task_id)
@@ -449,7 +449,7 @@ def test_rescoring_unaccessable(self):
num_students = 1
self._create_students_with_state(num_students, input_state)
task_entry = self._create_input_entry()
- with patch('lms.djangoapps.instructor_task.tasks_helper.module_state.get_block_for_descriptor', return_value=None): # lint-amnesty, pylint: disable=line-too-long
+ with patch('lms.djangoapps.instructor_task.tasks_helper.module_state.get_block_for_descriptor', return_value=None): # noqa: E501
self._run_task_with_mock_celery(rescore_problem, task_entry.id, task_entry.task_id)
self.assert_task_output(
@@ -467,7 +467,7 @@ def test_rescoring_success(self):
Tests rescores a problem in a course, for all students succeeds.
"""
mock_instance = MagicMock()
- getattr(mock_instance, 'rescore').return_value = None # lint-amnesty, pylint: disable=literal-used-as-attribute # noqa: B009
+ getattr(mock_instance, 'rescore').return_value = None # lint-amnesty, pylint: disable=literal-used-as-attribute # noqa: B009, E501
mock_instance.has_submitted_answer.return_value = True
del mock_instance.done # old CAPA code used to use this value so we delete it here to be sure
diff --git a/lms/djangoapps/instructor_task/tests/test_tasks_helper.py b/lms/djangoapps/instructor_task/tests/test_tasks_helper.py
index 9a1bb0be89e8..91514659f2e2 100644
--- a/lms/djangoapps/instructor_task/tests/test_tasks_helper.py
+++ b/lms/djangoapps/instructor_task/tests/test_tasks_helper.py
@@ -1587,7 +1587,7 @@ def __init__(self):
def open(self, file_name):
"""Mock out DefaultStorage.open with standard python open"""
- return open(file_name) # lint-amnesty, pylint: disable=bad-option-value, open-builtin # lint-amnesty, pylint: disable=consider-using-with
+ return open(file_name) # pylint: disable=bad-option-value, open-builtin # pylint: disable=consider-using-with
@patch('lms.djangoapps.instructor_task.tasks_helper.misc.DefaultStorage', new=MockDefaultStorage)
@@ -1725,7 +1725,7 @@ def test_preassigned_user(self):
)
self.verify_rows_in_csv(
[
- dict(list(zip(self.csv_header_row, ['Cohort 1', 'True', '0', '', '', 'example_email@example.com']))), # noqa: B905 # pylint: disable=line-too-long
+ dict(list(zip(self.csv_header_row, ['Cohort 1', 'True', '0', '', '', 'example_email@example.com']))), # noqa: B905
],
verify_order=False
)
diff --git a/lms/djangoapps/instructor_task/views.py b/lms/djangoapps/instructor_task/views.py
index 51e2812577fe..1b0e0b264bdb 100644
--- a/lms/djangoapps/instructor_task/views.py
+++ b/lms/djangoapps/instructor_task/views.py
@@ -152,19 +152,19 @@ def get_task_completion_info(instructor_task): # lint-amnesty, pylint: disable=
if instructor_task.task_state == PROGRESS:
# special message for providing progress updates:
- # Translators: {action} is a past-tense verb that is localized separately. {attempted} and {succeeded} are counts. # lint-amnesty, pylint: disable=line-too-long
+ # Translators: {action} is a past-tense verb that is localized separately. {attempted} and {succeeded} are counts. # noqa: E501
msg_format = _("Progress: {action} {succeeded} of {attempted} so far")
elif student is not None and problem_url is not None:
# this reports on actions on problems for a particular student:
if num_attempted == 0:
- # Translators: {action} is a past-tense verb that is localized separately. {student} is a student identifier. # lint-amnesty, pylint: disable=line-too-long
+ # Translators: {action} is a past-tense verb that is localized separately. {student} is a student identifier. # noqa: E501
msg_format = _("Unable to find submission to be {action} for student '{student}'")
elif num_succeeded == 0:
- # Translators: {action} is a past-tense verb that is localized separately. {student} is a student identifier. # lint-amnesty, pylint: disable=line-too-long
+ # Translators: {action} is a past-tense verb that is localized separately. {student} is a student identifier. # noqa: E501
msg_format = _("Problem failed to be {action} for student '{student}'")
else:
succeeded = True
- # Translators: {action} is a past-tense verb that is localized separately. {student} is a student identifier. # lint-amnesty, pylint: disable=line-too-long
+ # Translators: {action} is a past-tense verb that is localized separately. {student} is a student identifier. # noqa: E501
msg_format = _("Problem successfully {action} for student '{student}'")
elif student is not None and entrance_exam_url is not None:
# this reports on actions on entrance exam for a particular student:
@@ -190,7 +190,7 @@ def get_task_completion_info(instructor_task): # lint-amnesty, pylint: disable=
# Translators: {action} is a past-tense verb that is localized separately. {attempted} is a count.
msg_format = _("Problem successfully {action} for {attempted} students")
else: # num_succeeded < num_attempted
- # Translators: {action} is a past-tense verb that is localized separately. {succeeded} and {attempted} are counts. # lint-amnesty, pylint: disable=line-too-long
+ # Translators: {action} is a past-tense verb that is localized separately. {succeeded} and {attempted} are counts. # noqa: E501
msg_format = _("Problem {action} for {succeeded} of {attempted} students")
elif email_id is not None:
# this reports on actions on bulk emails
@@ -205,11 +205,11 @@ def get_task_completion_info(instructor_task): # lint-amnesty, pylint: disable=
# Translators: {action} is a past-tense verb that is localized separately. {attempted} is a count.
msg_format = _("Message successfully {action} for {attempted} recipients")
else: # num_succeeded < num_attempted
- # Translators: {action} is a past-tense verb that is localized separately. {succeeded} and {attempted} are counts. # lint-amnesty, pylint: disable=line-too-long
+ # Translators: {action} is a past-tense verb that is localized separately. {succeeded} and {attempted} are counts. # noqa: E501
msg_format = _("Message {action} for {succeeded} of {attempted} recipients")
else:
# provide a default:
- # Translators: {action} is a past-tense verb that is localized separately. {succeeded} and {attempted} are counts. # lint-amnesty, pylint: disable=line-too-long
+ # Translators: {action} is a past-tense verb that is localized separately. {succeeded} and {attempted} are counts. # noqa: E501
msg_format = _("Status: {action} {succeeded} of {attempted}")
if num_skipped > 0:
diff --git a/lms/djangoapps/learner_dashboard/tests/test_programs.py b/lms/djangoapps/learner_dashboard/tests/test_programs.py
index 262787347641..dd3b7aa3697e 100644
--- a/lms/djangoapps/learner_dashboard/tests/test_programs.py
+++ b/lms/djangoapps/learner_dashboard/tests/test_programs.py
@@ -88,7 +88,7 @@ def assert_dict_contains_subset(self, superset, subset):
Verify that the dict superset contains the dict subset.
"""
for key, value in subset.items():
- assert key in superset and superset[key] == value, f"{key}: {value} not found in superset or does not match" # noqa: PT018 # pylint: disable=line-too-long
+ assert key in superset and superset[key] == value, f"{key}: {value} not found in superset or does not match" # noqa: PT018
def test_login_required(self, mock_get_programs):
"""
diff --git a/lms/djangoapps/learner_home/mock/mock_views.py b/lms/djangoapps/learner_home/mock/mock_views.py
index 93a96791293e..a4db4de7be11 100644
--- a/lms/djangoapps/learner_home/mock/mock_views.py
+++ b/lms/djangoapps/learner_home/mock/mock_views.py
@@ -2,7 +2,6 @@
Mock implementation of the Learner Home.
Returns statically authored JSON data
"""
-# pylint: disable=line-too-long
import json
from os import path
diff --git a/lms/djangoapps/lti_provider/tests/test_users.py b/lms/djangoapps/lti_provider/tests/test_users.py
index 4ea0c4797ea4..9dc755aae2d9 100644
--- a/lms/djangoapps/lti_provider/tests/test_users.py
+++ b/lms/djangoapps/lti_provider/tests/test_users.py
@@ -163,7 +163,7 @@ def test_auto_linking_of_users_using_lis_person_contact_email_primary(self, crea
"full_name": "",
})
- def test_auto_linking_of_users_using_lis_person_contact_email_primary_case_insensitive(self, create_user, switch_user): # pylint: disable=line-too-long
+ def test_auto_linking_of_users_using_lis_person_contact_email_primary_case_insensitive(self, create_user, switch_user): # noqa: E501
request = RequestFactory().post("/", {"lis_person_contact_email_primary": self.old_user.email.upper()})
request.user = self.old_user
diff --git a/lms/djangoapps/mailing/management/commands/mailchimp_id.py b/lms/djangoapps/mailing/management/commands/mailchimp_id.py
index f8b195b4001d..0f6cdabdbb64 100644
--- a/lms/djangoapps/mailing/management/commands/mailchimp_id.py
+++ b/lms/djangoapps/mailing/management/commands/mailchimp_id.py
@@ -37,7 +37,7 @@ def handle(self, *args, **options):
mailchimp = MailSnake(key)
lists = mailchimp.lists()['data']
- by_web_id = {l['web_id']: l for l in lists}
+ by_web_id = {mailing_list['web_id']: mailing_list for mailing_list in lists}
list_with_id = by_web_id.get(web_id, None)
diff --git a/lms/djangoapps/mobile_api/course_info/views.py b/lms/djangoapps/mobile_api/course_info/views.py
index b8791327db2d..c456f858c1c0 100644
--- a/lms/djangoapps/mobile_api/course_info/views.py
+++ b/lms/djangoapps/mobile_api/course_info/views.py
@@ -178,7 +178,7 @@ def post(self, request, *args, **kwargs):
)
if not ENABLE_COURSE_GOALS.is_enabled(course_key):
- log.warning('For this mobile request, user activity is not enabled for this user {} and course {}'.format( # noqa: UP032 # pylint: disable=line-too-long
+ log.warning('For this mobile request, user activity is not enabled for this user {} and course {}'.format( # noqa: UP032
str(user_id), str(course_key))
)
return Response(status=(200))
@@ -291,7 +291,7 @@ class BlocksInfoInCourseView(BlocksInCourseView):
* 404 if the course is not available or cannot be seen.
"""
- def get_requested_user(self, user: UserType, username: Optional[str] = None) -> Union[UserType, None]: # noqa: UP007, UP045 # pylint: disable=line-too-long
+ def get_requested_user(self, user: UserType, username: Optional[str] = None) -> Union[UserType, None]: # noqa: UP007, UP045
"""
Return a user for whom the course blocks are fetched.
diff --git a/lms/djangoapps/mobile_api/tests/test_course_info_views.py b/lms/djangoapps/mobile_api/tests/test_course_info_views.py
index addb88335017..9e2f87274db8 100644
--- a/lms/djangoapps/mobile_api/tests/test_course_info_views.py
+++ b/lms/djangoapps/mobile_api/tests/test_course_info_views.py
@@ -263,13 +263,13 @@ def test_flag_disabled(self, mock_logger):
response = self.client.post(self.apiUrl, post_data)
assert response.status_code == 200
mock_logger.warning.assert_called_with(
- 'For this mobile request, user activity is not enabled for this user {} and course {}'.format( # noqa: UP032 # pylint: disable=line-too-long
+ 'For this mobile request, user activity is not enabled for this user {} and course {}'.format( # noqa: UP032
str(self.user.id), str(self.course.id))
)
@ddt.ddt
-class TestBlocksInfoInCourseView(TestBlocksInCourseView, MilestonesTestCaseMixin): # lint-amnesty, pylint: disable=test-inherits-tests
+class TestBlocksInfoInCourseView(TestBlocksInCourseView, MilestonesTestCaseMixin): # pylint: disable=test-inherits-tests
"""
Test class for BlocksInfoInCourseView
"""
@@ -384,7 +384,7 @@ def test_course_sharing_utm_parameters(self):
}
self.assertEqual(response.status_code, status.HTTP_200_OK) # noqa: PT009
- self.assertDictEqual(response.data['course_sharing_utm_parameters'], expected_course_sharing_utm_parameters) # noqa: PT009 # pylint: disable=line-too-long
+ self.assertDictEqual(response.data['course_sharing_utm_parameters'], expected_course_sharing_utm_parameters) # noqa: PT009
def test_course_about_url(self):
response = self.verify_response(url=self.url)
@@ -422,7 +422,7 @@ def test_extend_sequential_info_with_assignment_progress_get_only_sequential(sel
)
self.assertEqual(response.status_code, status.HTTP_200_OK) # noqa: PT009
- for sequential_info, assignment_progress in zip(response.data['blocks'].values(), expected_results): # noqa: B905 # pylint: disable=line-too-long
+ for sequential_info, assignment_progress in zip(response.data['blocks'].values(), expected_results): # noqa: B905
self.assertDictEqual(sequential_info['assignment_progress'], assignment_progress) # noqa: PT009
@ddt.data('chapter', 'vertical', 'problem', 'video', 'html')
@@ -434,7 +434,7 @@ def test_extend_sequential_info_with_assignment_progress_for_other_types(self, b
self.assertNotEqual('assignment_progress', block_info) # noqa: PT009
-class TestCourseEnrollmentDetailsView(MobileAPITestCase, MilestonesTestCaseMixin): # lint-amnesty, pylint: disable=test-inherits-tests
+class TestCourseEnrollmentDetailsView(MobileAPITestCase, MilestonesTestCaseMixin): # pylint: disable=test-inherits-tests
"""
Test class for CourseEnrollmentDetailsView
"""
@@ -491,7 +491,7 @@ def verify_course_info_overview(self, response):
'facebook': 'utm_medium=social&utm_campaign=social-sharing-db&utm_source=facebook',
'twitter': 'utm_medium=social&utm_campaign=social-sharing-db&utm_source=twitter'
}
- self.assertDictEqual(course_info['course_sharing_utm_parameters'], expected_course_sharing_utm_parameters) # noqa: PT009 # pylint: disable=line-too-long
+ self.assertDictEqual(course_info['course_sharing_utm_parameters'], expected_course_sharing_utm_parameters) # noqa: PT009
expected_course_modes = [{'slug': 'audit', 'sku': None, 'android_sku': None, 'ios_sku': None, 'min_price': 0}]
self.assertListEqual(course_info['course_modes'], expected_course_modes) # noqa: PT009
diff --git a/lms/djangoapps/mobile_api/tests/test_mobile_platform.py b/lms/djangoapps/mobile_api/tests/test_mobile_platform.py
index 944831dfe8c4..a0136dd772bd 100644
--- a/lms/djangoapps/mobile_api/tests/test_mobile_platform.py
+++ b/lms/djangoapps/mobile_api/tests/test_mobile_platform.py
@@ -26,9 +26,9 @@ class TestMobilePlatform(TestCase):
("edX/org.test-domain.mobile (2.26.3; OS Version 9.2 (Build 13C75))", "iOS", "2.26.3"),
("Dalvik/2.1.0 (Linux; U; Android 5.1; Nexus 5 Build/LMY47I) edX/org.edx.mobile/1.1.1", "Android", "1.1.1"),
("Dalvik/2.1.0 (Linux; U; Android 5.1; Nexus 5 Build/LMY47I) edX/org.edx.mobile/3.3.3.X", "Android", "3.3.3.X"),
- ("Dalvik/2.1.0 (Linux; U; Android 9; MI 6 MIUI/V11.0.3.0.PCAMIXM) edX/org.edx.mobile/2.17.1", "Android", "2.17.1"), # lint-amnesty, pylint: disable=line-too-long
- ("Dalvik/2.1.0 (Linux; U; Android 9; JKM-AL00a Build/HUAWEIJKM-AL00a) edX/org.edx.mobile/2.8.1", "Android", "2.8.1"), # lint-amnesty, pylint: disable=line-too-long
- ("Dalvik/2.1.0 (Linux; U; Android 8.1.0; CPH1803 Build/OPM1.171019.026) edX/org.edx.mobile/2.18.1", "Android", "2.18.1"), # lint-amnesty, pylint: disable=line-too-long
+ ("Dalvik/2.1.0 (Linux; U; Android 9; MI 6 MIUI/V11.0.3.0.PCAMIXM) edX/org.edx.mobile/2.17.1", "Android", "2.17.1"), # noqa: E501
+ ("Dalvik/2.1.0 (Linux; U; Android 9; JKM-AL00a Build/HUAWEIJKM-AL00a) edX/org.edx.mobile/2.8.1", "Android", "2.8.1"), # noqa: E501
+ ("Dalvik/2.1.0 (Linux; U; Android 8.1.0; CPH1803 Build/OPM1.171019.026) edX/org.edx.mobile/2.18.1", "Android", "2.18.1"), # noqa: E501
)
@ddt.unpack
def test_platform_instance(self, user_agent, platform_name, version):
diff --git a/lms/djangoapps/mobile_api/users/serializers.py b/lms/djangoapps/mobile_api/users/serializers.py
index 1a05677bfc4a..718011c79f3b 100644
--- a/lms/djangoapps/mobile_api/users/serializers.py
+++ b/lms/djangoapps/mobile_api/users/serializers.py
@@ -135,7 +135,7 @@ def get_course_modes(self, obj):
for mode in course_modes
]
- def to_representation(self, instance: CourseEnrollment) -> 'OrderedDict': # lint-amnesty, pylint: disable=unused-variable, line-too-long # noqa: F821
+ def to_representation(self, instance: CourseEnrollment) -> 'OrderedDict': # pylint: disable=unused-variable # noqa: F821
"""
Override the to_representation method to add the course_status field to the serialized data.
"""
@@ -204,7 +204,7 @@ def get_course_progress(self, model: CourseEnrollment) -> Dict[str, int]: # noq
"""
return get_assignments_completions(model.course_id, model.user)
- def get_course_assignments(self, model: CourseEnrollment) -> Dict[str, Optional[List[Dict[str, str]]]]: # noqa: UP006, UP045 # pylint: disable=line-too-long
+ def get_course_assignments(self, model: CourseEnrollment) -> Dict[str, Optional[List[Dict[str, str]]]]: # noqa: UP006, UP045
"""
Returns the future assignment data and past assignments data for the user in the course.
"""
diff --git a/lms/djangoapps/mobile_api/users/tests.py b/lms/djangoapps/mobile_api/users/tests.py
index 43e32abd9764..02cf0d70fb81 100644
--- a/lms/djangoapps/mobile_api/users/tests.py
+++ b/lms/djangoapps/mobile_api/users/tests.py
@@ -347,7 +347,7 @@ def _get_enrollment_data(self, api_version, expired):
return result
- def _assert_enrollment_results(self, api_version, courses, num_courses_returned, gating_enabled=True): # lint-amnesty, pylint: disable=missing-function-docstring
+ def _assert_enrollment_results(self, api_version, courses, num_courses_returned, gating_enabled=True): # pylint: disable=missing-function-docstring
assert len(courses) == num_courses_returned
if api_version == API_V05:
@@ -508,7 +508,7 @@ def test_student_have_two_enrollments(self):
self.assertEqual(response.status_code, status.HTTP_200_OK) # noqa: PT009
self.assertEqual(len(response.data['enrollments']['results']), 1) # noqa: PT009
self.assertEqual(response.data['enrollments']['count'], 1) # noqa: PT009
- self.assertEqual(response.data['enrollments']['results'][0]['course']['id'], str(course_first.id)) # noqa: PT009 # pylint: disable=line-too-long
+ self.assertEqual(response.data['enrollments']['results'][0]['course']['id'], str(course_first.id)) # noqa: PT009
self.assertIn('primary', response.data) # noqa: PT009
self.assertEqual(response.data['primary']['course']['id'], str(course_second.id)) # noqa: PT009
@@ -1050,7 +1050,7 @@ def test_course_progress_for_secondary_enrollments_with_query_param_and_assignme
self.assertIn('course_progress', response.data['primary']) # noqa: PT009
self.assertDictEqual(response.data['primary']['course_progress'], expected_course_progress) # noqa: PT009
self.assertIn('course_progress', response.data['enrollments']['results'][0]) # noqa: PT009
- self.assertDictEqual(response.data['enrollments']['results'][0]['course_progress'], expected_course_progress) # noqa: PT009 # pylint: disable=line-too-long
+ self.assertDictEqual(response.data['enrollments']['results'][0]['course_progress'], expected_course_progress) # noqa: PT009
@override_settings(MKTG_URLS={'ROOT': 'dummy-root'})
@@ -1353,8 +1353,8 @@ def test_success(self, api_version):
qstwitter = parse_qs('utm_campaign=social-sharing-db&utm_medium=social&utm_source=twitter')
qsfacebook = parse_qs('utm_campaign=social-sharing-db&utm_medium=social&utm_source=facebook')
- self.assertDictEqual(qsfacebook, parse_qs(serialized['course']['course_sharing_utm_parameters']['facebook'])) # noqa: PT009 # pylint: disable=line-too-long
- self.assertDictEqual(qstwitter, parse_qs(serialized['course']['course_sharing_utm_parameters']['twitter'])) # noqa: PT009 # pylint: disable=line-too-long
+ self.assertDictEqual(qsfacebook, parse_qs(serialized['course']['course_sharing_utm_parameters']['facebook'])) # noqa: PT009
+ self.assertDictEqual(qstwitter, parse_qs(serialized['course']['course_sharing_utm_parameters']['twitter'])) # noqa: PT009
@ddt.data(API_V05, API_V1)
def test_with_display_overrides(self, api_version):
diff --git a/lms/djangoapps/ora_staff_grader/views.py b/lms/djangoapps/ora_staff_grader/views.py
index 7bcbfc16d87d..11594ea8004c 100644
--- a/lms/djangoapps/ora_staff_grader/views.py
+++ b/lms/djangoapps/ora_staff_grader/views.py
@@ -98,7 +98,7 @@ def _is_staff_grader_enabled(self, course_key):
# This toggle is documented on the edx-ora2 repo in openassessment/xblock/config_mixin.py
# Note: Do not copy this practice of directly using a toggle from a library.
# Instead, see docs for exposing a wrapper api:
- # https://docs.openedx.org/projects/edx-toggles/en/latest/how_to/implement_the_right_toggle_type.html#using-other-toggles pylint: disable=line-too-long
+ # https://docs.openedx.org/projects/edx-toggles/en/latest/how_to/implement_the_right_toggle_type.html#using-other-toggles # noqa: E501
# pylint: disable=toggle-missing-annotation
enhanced_staff_grader_flag = CourseWaffleFlag(
f"{WAFFLE_NAMESPACE}.{ENHANCED_STAFF_GRADER}",
diff --git a/lms/djangoapps/program_enrollments/api/linking.py b/lms/djangoapps/program_enrollments/api/linking.py
index 4cb0feeb7d98..8201f743e176 100644
--- a/lms/djangoapps/program_enrollments/api/linking.py
+++ b/lms/djangoapps/program_enrollments/api/linking.py
@@ -107,7 +107,7 @@ def link_program_enrollments(program_uuid, external_keys_to_usernames):
# the requested user, then we should sever the link to the existing edX user before
# linking the ProgramEnrollment to the new user.
if program_enrollment.user and program_enrollment.user != user:
- message = ('Unlinking user with username={old_username} from program enrollment with ' # noqa: UP032 # pylint: disable=line-too-long
+ message = ('Unlinking user with username={old_username} from program enrollment with ' # noqa: UP032
'program uuid={program_uuid} with external_student_key={external_user_key} '
'and linking user with username={new_username} '
'to program enrollment.').format(
diff --git a/lms/djangoapps/program_enrollments/api/reading.py b/lms/djangoapps/program_enrollments/api/reading.py
index 6ac0973547a5..3da275026935 100644
--- a/lms/djangoapps/program_enrollments/api/reading.py
+++ b/lms/djangoapps/program_enrollments/api/reading.py
@@ -515,7 +515,7 @@ def get_saml_providers_by_org_key(org_key):
try:
organization = Organization.objects.get(short_name=org_key)
except Organization.DoesNotExist:
- raise BadOrganizationShortNameException(org_key) # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904
+ raise BadOrganizationShortNameException(org_key) # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904, E501
return get_saml_providers_for_organization(organization)
diff --git a/lms/djangoapps/program_enrollments/management/commands/link_program_enrollments.py b/lms/djangoapps/program_enrollments/management/commands/link_program_enrollments.py
index 00ebab3914ea..06c55c9d3652 100644
--- a/lms/djangoapps/program_enrollments/management/commands/link_program_enrollments.py
+++ b/lms/djangoapps/program_enrollments/management/commands/link_program_enrollments.py
@@ -73,7 +73,7 @@ def handle(self, program_uuid, user_items, *args, **options):
try:
parsed_program_uuid = UUID(program_uuid)
except ValueError:
- raise CommandError("supplied program_uuid '{}' is not a valid UUID") # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904
+ raise CommandError("supplied program_uuid '{}' is not a valid UUID") # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904, E501
ext_keys_to_usernames = self.parse_user_items(user_items)
try:
link_program_enrollments(
diff --git a/lms/djangoapps/program_enrollments/rest_api/v1/tests/test_views.py b/lms/djangoapps/program_enrollments/rest_api/v1/tests/test_views.py
index e322c000c3f3..3423c0523ce0 100644
--- a/lms/djangoapps/program_enrollments/rest_api/v1/tests/test_views.py
+++ b/lms/djangoapps/program_enrollments/rest_api/v1/tests/test_views.py
@@ -2295,7 +2295,7 @@ def test_pagination(self, page_size_string, expected_page_sizes):
and the sizes of the each request.
"""
- def mock_get_enrollment_overviews(user, program, enrollments, request): # lint-amnesty, pylint: disable=unused-argument
+ def mock_get_enrollment_overviews(user, program, enrollments, request): # pylint: disable=unused-argument
"""
Mock implementation of `utils.get_enrollments_overviews`
that returns a dict with the correct `course_run_id`
diff --git a/lms/djangoapps/program_enrollments/signals.py b/lms/djangoapps/program_enrollments/signals.py
index 255901da678c..01b311abc1ce 100644
--- a/lms/djangoapps/program_enrollments/signals.py
+++ b/lms/djangoapps/program_enrollments/signals.py
@@ -30,7 +30,7 @@ def _listen_for_lms_retire(sender, **kwargs): # pylint: disable=unused-argument
@receiver(post_save, sender=UserSocialAuth)
-def listen_for_social_auth_creation(sender, instance, created, **kwargs): # lint-amnesty, pylint: disable=unused-argument
+def listen_for_social_auth_creation(sender, instance, created, **kwargs): # pylint: disable=unused-argument
"""
Post-save signal that will attempt to link a social auth entry with waiting enrollments
"""
diff --git a/lms/djangoapps/support/views/utils.py b/lms/djangoapps/support/views/utils.py
index a44130790848..025e3166ff58 100644
--- a/lms/djangoapps/support/views/utils.py
+++ b/lms/djangoapps/support/views/utils.py
@@ -75,7 +75,7 @@ def validate_and_link_program_enrollments(program_uuid_string, linkage_text):
(item.get('external_key') or '').strip(): (item['username'] or '').strip()
for item in reader
}
- if not (all(ext_key_to_username.keys()) and all(ext_key_to_username.values())): # lint-amnesty, pylint: disable=consider-iterating-dictionary
+ if not (all(ext_key_to_username.keys()) and all(ext_key_to_username.values())): # pylint: disable=consider-iterating-dictionary
return [], [
"All linking lines must be in the format 'external_user_key,lms_username'"
]
diff --git a/lms/djangoapps/survey/models.py b/lms/djangoapps/survey/models.py
index 4dd5d89de266..92b21013a8aa 100644
--- a/lms/djangoapps/survey/models.py
+++ b/lms/djangoapps/survey/models.py
@@ -57,7 +57,7 @@ def validate_form_html(cls, html):
fields = cls.get_field_names_from_html(html)
except Exception as ex:
log.exception(f"Cannot parse SurveyForm html: {ex}")
- raise ValidationError(f"Cannot parse SurveyForm as HTML: {ex}") # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904
+ raise ValidationError(f"Cannot parse SurveyForm as HTML: {ex}") # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904, E501
if not len(fields): # lint-amnesty, pylint: disable=len-as-condition
raise ValidationError("SurveyForms must contain at least one form input field")
@@ -171,7 +171,7 @@ class SurveyAnswer(TimeStampedModel):
.. pii: These are free-form questions asked by course authors. Types below are current as of Feb 2019, new ones could be added. "other" PII currently includes "company", "job title", and "work experience".
.. pii_types: name, location, other
.. pii_retirement: retained
- """
+ """ # noqa: E501
user = models.ForeignKey(User, db_index=True, on_delete=models.CASCADE)
form = models.ForeignKey(SurveyForm, db_index=True, on_delete=models.CASCADE)
field_name = models.CharField(max_length=255, db_index=True)
diff --git a/lms/djangoapps/survey/tests/test_models.py b/lms/djangoapps/survey/tests/test_models.py
index e8c6619da647..e2b2ea53d898 100644
--- a/lms/djangoapps/survey/tests/test_models.py
+++ b/lms/djangoapps/survey/tests/test_models.py
@@ -39,7 +39,7 @@ def setUp(self):
)
self.test_survey_name = 'TestForm'
- self.test_form = '1 1
- """)
- # pylint: enable=line-too-long
+ """) # noqa: E501
def test_publish_subsection(self) -> None:
"""
diff --git a/openedx/core/djangoapps/content_libraries/tests/test_content_libraries.py b/openedx/core/djangoapps/content_libraries/tests/test_content_libraries.py
index 72655473dd3d..a2554adf893c 100644
--- a/openedx/core/djangoapps/content_libraries/tests/test_content_libraries.py
+++ b/openedx/core/djangoapps/content_libraries/tests/test_content_libraries.py
@@ -1650,7 +1650,7 @@ def test_authz_scope_with_combined_authz_and_legacy_permissions(self):
slugs = set(filtered.values_list('slug', flat=True))
self.assertIn('comb-lib1', slugs, "lib1 should be accessible via AuthZ permission") # noqa: PT009
self.assertIn('comb-lib2', slugs, "lib2 should be accessible via legacy permission") # noqa: PT009
- self.assertIn('comb-lib3', slugs, "lib3 should be accessible via BOTH AuthZ and legacy permissions") # noqa: PT009 # pylint: disable=line-too-long
+ self.assertIn('comb-lib3', slugs, "lib3 should be accessible via BOTH AuthZ and legacy permissions") # noqa: PT009
self.assertNotIn('comb-lib4', slugs, "lib4 should NOT be accessible (no permissions)") # noqa: PT009
# TEST: Verify lib3 doesn't get duplicated despite having both permission types
diff --git a/openedx/core/djangoapps/content_staging/tests/test_clipboard.py b/openedx/core/djangoapps/content_staging/tests/test_clipboard.py
index 4c26f2c97cca..a0a2f5fdd867 100644
--- a/openedx/core/djangoapps/content_staging/tests/test_clipboard.py
+++ b/openedx/core/djangoapps/content_staging/tests/test_clipboard.py
@@ -162,7 +162,7 @@ def test_copy_html(self) -> None:
Sample
]]>
- """).replace("\n", "") + "\n" # No newlines, expect one trailing newline.
+ """).replace("\n", "") + "\n" # No newlines, expect one trailing newline. # noqa: E501
# Now if we GET the clipboard again, the GET response should exactly equal the last POST response:
assert client.get(CLIPBOARD_ENDPOINT).json() == response_data
@@ -238,7 +238,7 @@ def test_copy_unit(self) -> None:
No
- """)
+ """) # noqa: E501
# Now if we GET the clipboard again, the GET response should exactly equal the last POST response:
assert client.get(CLIPBOARD_ENDPOINT).json() == response_data
diff --git a/openedx/core/djangoapps/contentserver/views.py b/openedx/core/djangoapps/contentserver/views.py
index 8cd3e9ccd770..7df06b74355b 100644
--- a/openedx/core/djangoapps/contentserver/views.py
+++ b/openedx/core/djangoapps/contentserver/views.py
@@ -365,7 +365,7 @@ def parse_range_header(header_value, content_length):
for byte_range_string in byte_ranges_string.split(','):
byte_range_string = byte_range_string.strip()
# Case 0:
- if '-' not in byte_range_string: # Invalid syntax of header value. # lint-amnesty, pylint: disable=no-else-raise
+ if '-' not in byte_range_string: # Invalid syntax of header value. # pylint: disable=no-else-raise # noqa: E501
raise ValueError('Invalid syntax.')
# Case 1: -500
elif byte_range_string.startswith('-'):
diff --git a/openedx/core/djangoapps/course_apps/plugins.py b/openedx/core/djangoapps/course_apps/plugins.py
index 0a416310853f..86df06340f3f 100644
--- a/openedx/core/djangoapps/course_apps/plugins.py
+++ b/openedx/core/djangoapps/course_apps/plugins.py
@@ -75,7 +75,7 @@ def set_enabled(cls, course_key: CourseKey, enabled: bool, user: 'User') -> bool
@classmethod
@abstractmethod
- def get_allowed_operations(cls, course_key: CourseKey, user: Optional['User'] = None) -> Dict[str, bool]: # noqa: F821, UP006 # pylint: disable=line-too-long
+ def get_allowed_operations(cls, course_key: CourseKey, user: Optional['User'] = None) -> Dict[str, bool]: # noqa: F821, UP006
"""
Returns a dictionary of available operations for this app.
diff --git a/openedx/core/djangoapps/course_date_signals/handlers.py b/openedx/core/djangoapps/course_date_signals/handlers.py
index 435a446edf7e..879ce26c2647 100644
--- a/openedx/core/djangoapps/course_date_signals/handlers.py
+++ b/openedx/core/djangoapps/course_date_signals/handlers.py
@@ -33,7 +33,7 @@ def _field_values(fields, xblock):
try:
result[field.name] = field.read_from(xblock)
except TypeError as exception:
- exception_message = "{message}, Block-location:{location}, Field-name:{field_name}".format( # noqa: UP032 # pylint: disable=line-too-long
+ exception_message = "{message}, Block-location:{location}, Field-name:{field_name}".format( # noqa: UP032
message=str(exception),
location=str(xblock.location),
field_name=field.name
diff --git a/openedx/core/djangoapps/course_date_signals/tests.py b/openedx/core/djangoapps/course_date_signals/tests.py
index 8478f69faee1..d6c1acea0a16 100644
--- a/openedx/core/djangoapps/course_date_signals/tests.py
+++ b/openedx/core/djangoapps/course_date_signals/tests.py
@@ -37,7 +37,7 @@ def test_basic_spacing(self):
(3, 'Section 3', timedelta(days=28)),
]
with patch.object(utils, 'get_expected_duration', return_value=timedelta(weeks=4)):
- actual = [(idx, section.display_name, offset) for (idx, section, offset) in utils.spaced_out_sections(self.course)] # lint-amnesty, pylint: disable=line-too-long
+ actual = [(idx, section.display_name, offset) for (idx, section, offset) in utils.spaced_out_sections(self.course)] # noqa: E501
assert actual == expected_sections
@@ -51,7 +51,7 @@ def test_hidden_sections(self):
(3, 'Section 3', timedelta(days=28)),
]
with patch.object(utils, 'get_expected_duration', return_value=timedelta(weeks=4)):
- actual = [(idx, section.display_name, offset) for (idx, section, offset) in utils.spaced_out_sections(self.course)] # lint-amnesty, pylint: disable=line-too-long
+ actual = [(idx, section.display_name, offset) for (idx, section, offset) in utils.spaced_out_sections(self.course)] # noqa: E501
assert actual == expected_sections
diff --git a/openedx/core/djangoapps/course_groups/cohorts.py b/openedx/core/djangoapps/course_groups/cohorts.py
index a3cfe38086d8..302ecc4a99ed 100644
--- a/openedx/core/djangoapps/course_groups/cohorts.py
+++ b/openedx/core/djangoapps/course_groups/cohorts.py
@@ -439,7 +439,7 @@ def remove_user_from_cohort(cohort, username_or_email):
membership.delete()
COHORT_MEMBERSHIP_UPDATED.send(sender=None, user=user, course_key=course_key)
except CohortMembership.DoesNotExist:
- raise ValueError(f"User {username_or_email} was not present in cohort {cohort}") # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904
+ raise ValueError(f"User {username_or_email} was not present in cohort {cohort}") # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904, E501
def add_user_to_cohort(cohort, username_or_email_or_user):
diff --git a/openedx/core/djangoapps/course_groups/models.py b/openedx/core/djangoapps/course_groups/models.py
index 21f2f42c8945..826cf90c7fe3 100644
--- a/openedx/core/djangoapps/course_groups/models.py
+++ b/openedx/core/djangoapps/course_groups/models.py
@@ -235,7 +235,7 @@ class CourseCohortsSettings(models.Model): # noqa: DJ008
help_text="Which course are these settings associated with?",
)
- _cohorted_discussions = models.TextField(db_column='cohorted_discussions', null=True, blank=True) # JSON list # noqa: DJ001 # pylint: disable=line-too-long
+ _cohorted_discussions = models.TextField(db_column='cohorted_discussions', null=True, blank=True) # JSON list # noqa: DJ001, E501
# Note that although a default value is specified here for always_cohort_inline_discussions (False),
# in reality the default value at the time that cohorting is enabled for a course comes from
diff --git a/openedx/core/djangoapps/course_groups/views.py b/openedx/core/djangoapps/course_groups/views.py
index 8806e9649ecb..a1ca064c9c75 100644
--- a/openedx/core/djangoapps/course_groups/views.py
+++ b/openedx/core/djangoapps/course_groups/views.py
@@ -313,7 +313,7 @@ def add_users_to_cohort(request, course_key_string, cohort_id):
try:
cohort = cohorts.get_cohort_by_id(course_key, cohort_id)
except CourseUserGroup.DoesNotExist:
- raise Http404("Cohort (ID {cohort_id}) not found for {course_key_string}".format( # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904, UP032
+ raise Http404("Cohort (ID {cohort_id}) not found for {course_key_string}".format( # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904, E501, UP032
cohort_id=cohort_id,
course_key_string=course_key_string
))
@@ -774,7 +774,7 @@ def _get_course_and_cohort(self, request, course_key_string, cohort_id):
cohort_id=cohort_id,
course_key_string=course_key_string
)
- raise self.api_error(status.HTTP_404_NOT_FOUND, msg, 'cohort-not-found') # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904
+ raise self.api_error(status.HTTP_404_NOT_FOUND, msg, 'cohort-not-found') # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904, E501
return course_key, cohort
def get(self, request, course_key_string, cohort_id, username=None): # pylint: disable=unused-argument
@@ -807,7 +807,7 @@ def delete(self, request, course_key_string, cohort_id, username=None):
try:
api.remove_user_from_cohort(course_key, username, cohort.id)
except User.DoesNotExist:
- raise self.api_error(status.HTTP_404_NOT_FOUND, 'User does not exist.', 'user-not-found') # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904
+ raise self.api_error(status.HTTP_404_NOT_FOUND, 'User does not exist.', 'user-not-found') # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904, E501
except CohortMembership.DoesNotExist: # pylint: disable=duplicate-except
raise self.api_error( # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904
status.HTTP_400_BAD_REQUEST,
diff --git a/openedx/core/djangoapps/course_live/plugins.py b/openedx/core/djangoapps/course_live/plugins.py
index b95c28bdfa27..836937d00809 100644
--- a/openedx/core/djangoapps/course_live/plugins.py
+++ b/openedx/core/djangoapps/course_live/plugins.py
@@ -57,7 +57,7 @@ def set_enabled(cls, course_key: CourseKey, enabled: bool, user: User) -> bool:
return configuration.enabled
@classmethod
- def get_allowed_operations(cls, course_key: CourseKey, user: Optional[User] = None) -> Dict[str, bool]: # noqa: UP006, UP045 # pylint: disable=line-too-long
+ def get_allowed_operations(cls, course_key: CourseKey, user: Optional[User] = None) -> Dict[str, bool]: # noqa: UP006, UP045
"""
Return allowed operations for live app.
"""
diff --git a/openedx/core/djangoapps/course_live/tests/test_views.py b/openedx/core/djangoapps/course_live/tests/test_views.py
index 495dfccc969a..e07988680c8d 100644
--- a/openedx/core/djangoapps/course_live/tests/test_views.py
+++ b/openedx/core/djangoapps/course_live/tests/test_views.py
@@ -178,9 +178,9 @@ def test_update_configurations_data(self, provider, share_email, share_username)
self.assertEqual(updated_data['enabled'], live_configurations.enabled) # noqa: PT009
self.assertEqual(updated_data['provider_type'], live_configurations.provider_type) # noqa: PT009
- self.assertEqual(updated_lti_config.get('lti_1p1_client_key'), lti_configuration.lti_1p1_client_key) # noqa: PT009 # pylint: disable=line-too-long
- self.assertEqual(lti_config.get('lti_1p1_client_secret'), lti_configuration.lti_1p1_client_secret) # noqa: PT009 # pylint: disable=line-too-long
- self.assertEqual(updated_lti_config.get('lti_1p1_launch_url'), lti_configuration.lti_1p1_launch_url) # noqa: PT009 # pylint: disable=line-too-long
+ self.assertEqual(updated_lti_config.get('lti_1p1_client_key'), lti_configuration.lti_1p1_client_key) # noqa: PT009
+ self.assertEqual(lti_config.get('lti_1p1_client_secret'), lti_configuration.lti_1p1_client_secret) # noqa: PT009
+ self.assertEqual(updated_lti_config.get('lti_1p1_launch_url'), lti_configuration.lti_1p1_launch_url) # noqa: PT009
provider_instance = ProviderManager().get_enabled_providers().get(provider)
additional_param = {'additional_parameters': {}}
@@ -460,4 +460,4 @@ def test_live_configuration_disabled(self):
provider_type="zoom",
)
response = self.client.get(self.url)
- self.assertEqual(response.data['developer_message'], 'Course live is not enabled for this course.') # noqa: PT009 # pylint: disable=line-too-long
+ self.assertEqual(response.data['developer_message'], 'Course live is not enabled for this course.') # noqa: PT009
diff --git a/openedx/core/djangoapps/courseware_api/serializers.py b/openedx/core/djangoapps/courseware_api/serializers.py
index dcfc421fde8d..366264d1b44c 100644
--- a/openedx/core/djangoapps/courseware_api/serializers.py
+++ b/openedx/core/djangoapps/courseware_api/serializers.py
@@ -57,7 +57,7 @@ class Meta:
ref_name = 'courseware_api'
-class CourseProgramSerializer(serializers.Serializer): # lint-amnesty, pylint: disable=abstract-method, missing-class-docstring
+class CourseProgramSerializer(serializers.Serializer): # pylint: disable=abstract-method, missing-class-docstring
progress = serializers.SerializerMethodField()
slug = serializers.CharField()
title = serializers.CharField()
diff --git a/openedx/core/djangoapps/credentials/apps.py b/openedx/core/djangoapps/credentials/apps.py
index 0791d4795bd6..10d1babacda0 100644
--- a/openedx/core/djangoapps/credentials/apps.py
+++ b/openedx/core/djangoapps/credentials/apps.py
@@ -44,6 +44,6 @@ class CredentialsConfig(AppConfig):
def ready(self):
# Register celery workers
- from openedx.core.djangoapps.credentials.tasks.v1 import ( # lint-amnesty, pylint: disable=unused-import, unused-variable
+ from openedx.core.djangoapps.credentials.tasks.v1 import ( # pylint: disable=unused-import, unused-variable
tasks, # noqa: F401
)
diff --git a/openedx/core/djangoapps/credentials/tests/test_tasks.py b/openedx/core/djangoapps/credentials/tests/test_tasks.py
index de0dd7f0c1fb..4177ab07f2dd 100644
--- a/openedx/core/djangoapps/credentials/tests/test_tasks.py
+++ b/openedx/core/djangoapps/credentials/tests/test_tasks.py
@@ -338,8 +338,8 @@ def test_username_arg(self, mock_send):
self.options['user_ids'] = [str(self.user.id), str(self.user2.id)]
tasks.handle_notify_credentials(options=self.options, course_keys=[])
assert mock_send.called
- self.assertListEqual(list(mock_send.call_args[0][0]), [self.cert1, self.cert2, self.cert4, self.cert3]) # noqa: PT009 # pylint: disable=line-too-long
- self.assertListEqual(list(mock_send.call_args[0][1]), [self.grade1, self.grade2, self.grade4, self.grade3]) # noqa: PT009 # pylint: disable=line-too-long
+ self.assertListEqual(list(mock_send.call_args[0][0]), [self.cert1, self.cert2, self.cert4, self.cert3]) # noqa: PT009
+ self.assertListEqual(list(mock_send.call_args[0][1]), [self.grade1, self.grade2, self.grade4, self.grade3]) # noqa: PT009
mock_send.reset_mock()
@mock.patch(TASKS_MODULE + '.send_notifications')
@@ -494,14 +494,14 @@ def test_send_grade_if_right_cert(self, called, mode, status, mock_is_course_run
tasks.send_grade_if_interesting(self.user, self.key, None, None, 'A', 1.0)
assert mock_send_grade_to_credentials.delay.called is called
- def test_send_grade_missing_cert(self, _, mock_send_grade_to_credentials, _mock_is_learner_issuance_enabled): # noqa: PT019 # pylint: disable=line-too-long
+ def test_send_grade_missing_cert(self, _, mock_send_grade_to_credentials, _mock_is_learner_issuance_enabled): # noqa: PT019
tasks.send_grade_if_interesting(self.user, self.key, None, None, 'A', 1.0)
assert not mock_send_grade_to_credentials.delay.called
@ddt.data([True], [False])
@ddt.unpack
def test_send_grade_if_in_a_program(self, in_program, mock_is_course_run_in_a_program,
- mock_send_grade_to_credentials, _mock_is_learner_issuance_enabled): # noqa: PT019 # pylint: disable=line-too-long
+ mock_send_grade_to_credentials, _mock_is_learner_issuance_enabled): # noqa: PT019
mock_is_course_run_in_a_program.return_value = in_program
tasks.send_grade_if_interesting(self.user, self.key, 'verified', 'downloadable', 'A', 1.0)
assert mock_send_grade_to_credentials.delay.called is in_program
@@ -526,8 +526,8 @@ def test_send_grade_without_issuance_enabled(self, _mock_is_course_run_in_a_prog
assert mock_is_learner_issuance_enabled.called
assert not mock_send_grade_to_credentials.delay.called
- def test_send_grade_records_enabled(self, _mock_is_course_run_in_a_program, mock_send_grade_to_credentials, # noqa: PT019 # pylint: disable=line-too-long
- _mock_is_learner_issuance_enabled): # noqa: PT019 # pylint: disable=line-too-long
+ def test_send_grade_records_enabled(self, _mock_is_course_run_in_a_program, mock_send_grade_to_credentials, # noqa: PT019
+ _mock_is_learner_issuance_enabled): # noqa: PT019
site_config = SiteConfigurationFactory.create(
site_values={'course_org_filter': [self.key.org]}
)
diff --git a/openedx/core/djangoapps/credit/tests/test_serializers.py b/openedx/core/djangoapps/credit/tests/test_serializers.py
index 9e42817d7a99..726a4a9af788 100644
--- a/openedx/core/djangoapps/credit/tests/test_serializers.py
+++ b/openedx/core/djangoapps/credit/tests/test_serializers.py
@@ -56,7 +56,7 @@ def test_check_keys_exist_for_provider_string(self):
serializer = serializers.CreditProviderCallbackSerializer()
with pytest.raises(PermissionDenied):
- serializer._check_keys_exist_for_provider(secret_key, provider_id) # lint-amnesty, pylint: disable=protected-access
+ serializer._check_keys_exist_for_provider(secret_key, provider_id) # pylint: disable=protected-access
def test_check_keys_exist_for_provider_list_no_keys(self):
"""
@@ -70,7 +70,7 @@ def test_check_keys_exist_for_provider_list_no_keys(self):
serializer = serializers.CreditProviderCallbackSerializer()
with pytest.raises(PermissionDenied):
- serializer._check_keys_exist_for_provider(secret_key, provider_id) # lint-amnesty, pylint: disable=protected-access
+ serializer._check_keys_exist_for_provider(secret_key, provider_id) # pylint: disable=protected-access
def test_check_keys_exist_for_provider_list_with_key_present(self):
"""
@@ -82,7 +82,7 @@ def test_check_keys_exist_for_provider_list_with_key_present(self):
provider_id = 'asu'
serializer = serializers.CreditProviderCallbackSerializer()
- result = serializer._check_keys_exist_for_provider(secret_key, provider_id) # lint-amnesty, pylint: disable=assignment-from-no-return, protected-access
+ result = serializer._check_keys_exist_for_provider(secret_key, provider_id) # pylint: disable=assignment-from-no-return, protected-access
# No return value, so we expect successful execution to return None
assert result is None
@@ -101,7 +101,7 @@ def test_compare_signatures_string_key(self):
)
with pytest.raises(PermissionDenied):
# The first arg here is key we have (that doesn't match the sig)
- serializer._compare_signatures('abcd1234', provider.provider_id) # lint-amnesty, pylint: disable=protected-access
+ serializer._compare_signatures('abcd1234', provider.provider_id) # pylint: disable=protected-access
def test_compare_signatures_list_key(self):
"""
diff --git a/openedx/core/djangoapps/credit/tests/test_views.py b/openedx/core/djangoapps/credit/tests/test_views.py
index b07b76877792..2e89fc94919d 100644
--- a/openedx/core/djangoapps/credit/tests/test_views.py
+++ b/openedx/core/djangoapps/credit/tests/test_views.py
@@ -241,7 +241,7 @@ def test_get(self):
assert response.status_code == 200
# Verify the API returns the serialized CreditCourse
- self.assertDictEqual(json.loads(response.content.decode('utf-8')), self._serialize_credit_course(cc1)) # noqa: PT009 # pylint: disable=line-too-long
+ self.assertDictEqual(json.loads(response.content.decode('utf-8')), self._serialize_credit_course(cc1)) # noqa: PT009
def test_list(self):
""" Verify the endpoint supports listing all CreditCourse objects. """
diff --git a/openedx/core/djangoapps/credit/views.py b/openedx/core/djangoapps/credit/views.py
index c29fb84d086b..5fbed2fbaff0 100644
--- a/openedx/core/djangoapps/credit/views.py
+++ b/openedx/core/djangoapps/credit/views.py
@@ -162,7 +162,7 @@ def filter_queryset(self, queryset):
try:
course_key = CourseKey.from_string(course_key)
except InvalidKeyError:
- raise ValidationError({'detail': f'[{course_key}] is not a valid course key.'}) # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904
+ raise ValidationError({'detail': f'[{course_key}] is not a valid course key.'}) # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904, E501
return queryset.filter(
username=username,
course__course_key=course_key,
diff --git a/openedx/core/djangoapps/dark_lang/tests.py b/openedx/core/djangoapps/dark_lang/tests.py
index 10727a9470be..b1fe595f404c 100644
--- a/openedx/core/djangoapps/dark_lang/tests.py
+++ b/openedx/core/djangoapps/dark_lang/tests.py
@@ -251,7 +251,7 @@ def _post_set_preview_lang(self, preview_language):
"""
Sends a post request to set the preview language
"""
- return self.client.post('/update_lang/', {'preview_language': preview_language, 'action': 'set_preview_language'}) # lint-amnesty, pylint: disable=line-too-long
+ return self.client.post('/update_lang/', {'preview_language': preview_language, 'action': 'set_preview_language'}) # noqa: E501
def _post_clear_preview_lang(self):
"""
diff --git a/openedx/core/djangoapps/dark_lang/views.py b/openedx/core/djangoapps/dark_lang/views.py
index 4d0ce352b3ba..ad5ada4e3e44 100644
--- a/openedx/core/djangoapps/dark_lang/views.py
+++ b/openedx/core/djangoapps/dark_lang/views.py
@@ -29,7 +29,7 @@ class PreviewLanguageFragmentView(EdxFragmentView):
POST - updates or clears the setting to the given dark language
"""
- def render_to_fragment(self, request, course_id=None, **kwargs): # lint-amnesty, pylint: disable=arguments-differ, unused-argument
+ def render_to_fragment(self, request, course_id=None, **kwargs): # pylint: disable=arguments-differ, unused-argument
"""
Renders the language preview view as a fragment.
"""
diff --git a/openedx/core/djangoapps/discussions/models.py b/openedx/core/djangoapps/discussions/models.py
index 0eed39e500a0..90d77966d2c9 100644
--- a/openedx/core/djangoapps/discussions/models.py
+++ b/openedx/core/djangoapps/discussions/models.py
@@ -266,7 +266,7 @@ def pii_sharing_required_message(provider_name):
'supports_lti': True,
'external_links': ProviderExternalLinks(
learn_more='https://piazza.com/product/overview',
- configuration='https://support.piazza.com/support/solutions/articles/48001065447-configure-piazza-within-edx', # pylint: disable=line-too-long
+ configuration='https://support.piazza.com/support/solutions/articles/48001065447-configure-piazza-within-edx',
general='https://support.piazza.com/',
accessibility='https://piazza.com/product/accessibility',
contact_email='team@piazza.com',
@@ -480,7 +480,7 @@ def clean(self):
raise ValidationError('Context Key should be an existing learning context.')
def __str__(self):
- return "DiscussionsConfiguration(context_key='{context_key}', provider='{provider}', enabled={enabled})".format( # noqa: UP032 # pylint: disable=line-too-long
+ return "DiscussionsConfiguration(context_key='{context_key}', provider='{provider}', enabled={enabled})".format( # noqa: UP032
context_key=self.context_key,
provider=self.provider_type,
enabled=self.enabled,
diff --git a/openedx/core/djangoapps/discussions/plugins.py b/openedx/core/djangoapps/discussions/plugins.py
index 06b62e92aa23..e5ab12a448e2 100644
--- a/openedx/core/djangoapps/discussions/plugins.py
+++ b/openedx/core/djangoapps/discussions/plugins.py
@@ -54,7 +54,7 @@ def set_enabled(cls, course_key: CourseKey, enabled: bool, user: 'User') -> bool
return configuration.enabled
@classmethod
- def get_allowed_operations(cls, course_key: CourseKey, user: Optional[User] = None) -> Dict[str, bool]: # noqa: UP006, UP045 # pylint: disable=line-too-long
+ def get_allowed_operations(cls, course_key: CourseKey, user: Optional[User] = None) -> Dict[str, bool]: # noqa: UP006, UP045
"""
Return allowed operations for discussions app.
"""
diff --git a/openedx/core/djangoapps/discussions/url_helpers.py b/openedx/core/djangoapps/discussions/url_helpers.py
index d36e30bc6e03..f5008780821c 100644
--- a/openedx/core/djangoapps/discussions/url_helpers.py
+++ b/openedx/core/djangoapps/discussions/url_helpers.py
@@ -48,7 +48,7 @@ def get_discussions_mfe_url(course_key: CourseKey, view: Optional[str] = None) -
return _get_url_with_view_query_params(f"{course_key}/", view)
-def get_discussions_mfe_topic_url(course_key: CourseKey, topic_id: str, view: Optional[str] = None) -> str: # noqa: UP045 # pylint: disable=line-too-long
+def get_discussions_mfe_topic_url(course_key: CourseKey, topic_id: str, view: Optional[str] = None) -> str: # noqa: UP045
"""
Returns the url for discussions for the specified course and topic in the discussions MFE.
diff --git a/openedx/core/djangoapps/discussions/utils.py b/openedx/core/djangoapps/discussions/utils.py
index 9a5aa2365704..622b6eafa4cc 100644
--- a/openedx/core/djangoapps/discussions/utils.py
+++ b/openedx/core/djangoapps/discussions/utils.py
@@ -46,7 +46,7 @@ def get_divided_discussions(
return divided_course_wide_discussions, divided_inline_discussions
-def get_discussion_categories_ids(course: CourseBlock, user: Optional[User], include_all: bool = False) -> List[str]: # noqa: UP006, UP045 # pylint: disable=line-too-long
+def get_discussion_categories_ids(course: CourseBlock, user: Optional[User], include_all: bool = False) -> List[str]: # noqa: UP006, UP045
"""
Returns a list of available ids of categories for the course that
are accessible to the given user.
diff --git a/openedx/core/djangoapps/django_comment_common/comment_client/course.py b/openedx/core/djangoapps/django_comment_common/comment_client/course.py
index 2f7309ab592e..7b9a8da32b76 100644
--- a/openedx/core/djangoapps/django_comment_common/comment_client/course.py
+++ b/openedx/core/djangoapps/django_comment_common/comment_client/course.py
@@ -32,7 +32,7 @@ def get_course_commentable_counts(course_key: CourseKey) -> Dict[str, Dict[str,
@function_trace("get_course_user_stats")
-def get_course_user_stats(course_key: CourseKey, params: Optional[Dict] = None) -> Dict[str, Dict[str, int]]: # noqa: UP006, UP045 # pylint: disable=line-too-long
+def get_course_user_stats(course_key: CourseKey, params: Optional[Dict] = None) -> Dict[str, Dict[str, int]]: # noqa: UP006, UP045
"""
Get stats about a user's participation in a course.
diff --git a/openedx/core/djangoapps/django_comment_common/comment_client/models.py b/openedx/core/djangoapps/django_comment_common/comment_client/models.py
index 80001bdc7ad0..5aad92b72ee6 100644
--- a/openedx/core/djangoapps/django_comment_common/comment_client/models.py
+++ b/openedx/core/djangoapps/django_comment_common/comment_client/models.py
@@ -34,7 +34,7 @@ def __getattr__(self, name):
return self.attributes[name]
except KeyError:
if self.retrieved or self.id is None:
- raise AttributeError(f"Field {name} does not exist") # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904
+ raise AttributeError(f"Field {name} does not exist") # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904, E501
self.retrieve()
return self.__getattr__(name)
@@ -177,7 +177,7 @@ def url(cls, action, params=None):
try:
return cls.url_with_id(params)
except KeyError:
- raise CommentClientRequestError(f"Cannot perform action {action} without id") # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904
+ raise CommentClientRequestError(f"Cannot perform action {action} without id") # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904, E501
else: # action must be in DEFAULT_ACTIONS_WITHOUT_ID now
return cls.url_without_id()
diff --git a/openedx/core/djangoapps/django_comment_common/comment_client/thread.py b/openedx/core/djangoapps/django_comment_common/comment_client/thread.py
index 31f4319f2301..df91f4737cea 100644
--- a/openedx/core/djangoapps/django_comment_common/comment_client/thread.py
+++ b/openedx/core/djangoapps/django_comment_common/comment_client/thread.py
@@ -100,7 +100,7 @@ def search(cls, query_params):
}
)
log.info(
- 'forum_text_search query="{search_query}" corrected_text="{corrected_text}" course_id={course_id} ' # noqa: UP032 # pylint: disable=line-too-long
+ 'forum_text_search query="{search_query}" corrected_text="{corrected_text}" course_id={course_id} ' # noqa: UP032
'group_id={group_id} page={requested_page} total_results={total_results}'.format(
search_query=search_query,
corrected_text=corrected_text,
diff --git a/openedx/core/djangoapps/django_comment_common/comment_client/utils.py b/openedx/core/djangoapps/django_comment_common/comment_client/utils.py
index c49581fdf165..8a38ba20923c 100644
--- a/openedx/core/djangoapps/django_comment_common/comment_client/utils.py
+++ b/openedx/core/djangoapps/django_comment_common/comment_client/utils.py
@@ -11,13 +11,13 @@
def strip_none(dic):
- return {k: v for k, v in dic.items() if v is not None} # lint-amnesty, pylint: disable=consider-using-dict-comprehension
+ return {k: v for k, v in dic.items() if v is not None} # pylint: disable=consider-using-dict-comprehension
def strip_blank(dic):
def _is_blank(v):
return isinstance(v, str) and len(v.strip()) == 0
- return {k: v for k, v in dic.items() if not _is_blank(v)} # lint-amnesty, pylint: disable=consider-using-dict-comprehension
+ return {k: v for k, v in dic.items() if not _is_blank(v)} # pylint: disable=consider-using-dict-comprehension
def extract(dic, keys):
diff --git a/openedx/core/djangoapps/django_comment_common/models.py b/openedx/core/djangoapps/django_comment_common/models.py
index 109d2b94c212..15325692355a 100644
--- a/openedx/core/djangoapps/django_comment_common/models.py
+++ b/openedx/core/djangoapps/django_comment_common/models.py
@@ -106,7 +106,7 @@ def inherit_permissions(self, role):
self.add_permission(per)
def add_permission(self, permission):
- self.permissions.add(Permission.objects.get_or_create(name=permission)[0]) # lint-amnesty, pylint: disable=no-member
+ self.permissions.add(Permission.objects.get_or_create(name=permission)[0]) # pylint: disable=no-member
def has_permission(self, permission):
"""
@@ -272,7 +272,7 @@ class CourseDiscussionSettings(models.Model): # noqa: DJ008
)
always_divide_inline_discussions = models.BooleanField(default=False)
reported_content_email_notifications = models.BooleanField(default=False)
- _divided_discussions = models.TextField(db_column='divided_discussions', null=True, blank=True) # JSON list # noqa: DJ001 # pylint: disable=line-too-long
+ _divided_discussions = models.TextField(db_column='divided_discussions', null=True, blank=True) # JSON list # noqa: DJ001, E501
COHORT = 'cohort'
ENROLLMENT_TRACK = 'enrollment_track'
diff --git a/openedx/core/djangoapps/django_comment_common/utils.py b/openedx/core/djangoapps/django_comment_common/utils.py
index 89d074653ae1..321d33583d42 100644
--- a/openedx/core/djangoapps/django_comment_common/utils.py
+++ b/openedx/core/djangoapps/django_comment_common/utils.py
@@ -86,7 +86,7 @@ def are_permissions_roles_seeded(course_id):
moderator_role = Role.objects.get(name=FORUM_ROLE_MODERATOR, course_id=course_id)
group_moderator_role = Role.objects.get(name=FORUM_ROLE_GROUP_MODERATOR, course_id=course_id)
student_role = Role.objects.get(name=FORUM_ROLE_STUDENT, course_id=course_id)
- except: # pylint: disable=bare-except
+ except: # noqa: E722
return False
for per in STUDENT_ROLE_PERMISSIONS:
diff --git a/openedx/core/djangoapps/embargo/api.py b/openedx/core/djangoapps/embargo/api.py
index cba176f76363..add3cacd0dd8 100644
--- a/openedx/core/djangoapps/embargo/api.py
+++ b/openedx/core/djangoapps/embargo/api.py
@@ -178,7 +178,7 @@ def _get_user_country_from_profile(user: types.User) -> str:
return profile_country
-def get_embargo_response(request: Request, course_key: CourseKey, user: types.User) -> Optional[Response]: # noqa: UP045 # pylint: disable=line-too-long
+def get_embargo_response(request: Request, course_key: CourseKey, user: types.User) -> Optional[Response]: # noqa: UP045
"""
Check whether any country access rules block the user from enrollment.
diff --git a/openedx/core/djangoapps/embargo/tests/test_api.py b/openedx/core/djangoapps/embargo/tests/test_api.py
index 10010a732d39..43324763e59c 100644
--- a/openedx/core/djangoapps/embargo/tests/test_api.py
+++ b/openedx/core/djangoapps/embargo/tests/test_api.py
@@ -265,7 +265,7 @@ def test_redirect_if_blocked_ips(self, ips, allow_access, mock_country):
)
@ddt.unpack
@mock.patch('openedx.core.djangoapps.embargo.api.check_course_access', return_value=False)
- def test_redirect_if_blocked_courseware(self, access_point, check_disabled, allow_access, _mock_access): # noqa: PT019 # pylint: disable=line-too-long
+ def test_redirect_if_blocked_courseware(self, access_point, check_disabled, allow_access, _mock_access): # noqa: PT019
self.restricted_course.disable_access_check = check_disabled
self.restricted_course.save()
diff --git a/openedx/core/djangoapps/embargo/tests/test_forms.py b/openedx/core/djangoapps/embargo/tests/test_forms.py
index 1fe0418758b7..55b67fe3d72b 100644
--- a/openedx/core/djangoapps/embargo/tests/test_forms.py
+++ b/openedx/core/djangoapps/embargo/tests/test_forms.py
@@ -122,5 +122,5 @@ def test_add_invalid_ips(self):
" Please fix the error(s) and try again."
assert bmsg == form._errors['blacklist'][0] # pylint: disable=protected-access
- with self.assertRaisesRegex(ValueError, "The IPFilter could not be created because the data didn't validate."): # noqa: PT027 # pylint: disable=line-too-long
+ with self.assertRaisesRegex(ValueError, "The IPFilter could not be created because the data didn't validate."): # noqa: PT027
form.save()
diff --git a/openedx/core/djangoapps/embargo/tests/test_middleware.py b/openedx/core/djangoapps/embargo/tests/test_middleware.py
index eaa2ef1bbd88..f810664acea5 100644
--- a/openedx/core/djangoapps/embargo/tests/test_middleware.py
+++ b/openedx/core/djangoapps/embargo/tests/test_middleware.py
@@ -53,7 +53,7 @@ def setUp(self):
@patch.dict(settings.FEATURES, {'EMBARGO': True})
@ddt.data(True, False)
def test_blocked(self, disable_access_check):
- with restrict_course(self.course.id, access_point='courseware', disable_access_check=disable_access_check) as redirect_url: # pylint: disable=line-too-long
+ with restrict_course(self.course.id, access_point='courseware', disable_access_check=disable_access_check) as redirect_url: # noqa: E501
response = self.client.get(self.courseware_url)
if disable_access_check:
assert response.status_code == 200
diff --git a/openedx/core/djangoapps/embargo/tests/test_views.py b/openedx/core/djangoapps/embargo/tests/test_views.py
index 9dd072c6ede6..1372e4c2fae7 100644
--- a/openedx/core/djangoapps/embargo/tests/test_views.py
+++ b/openedx/core/djangoapps/embargo/tests/test_views.py
@@ -107,7 +107,7 @@ def setUp(self):
super().setUp()
self.url = reverse('api_embargo:v1_course_access')
user = UserFactory(is_staff=True)
- self.client.login(username=user.username, password=UserFactory._DEFAULT_PASSWORD) # lint-amnesty, pylint: disable=protected-access
+ self.client.login(username=user.username, password=UserFactory._DEFAULT_PASSWORD) # pylint: disable=protected-access
self.course_id = str(CourseFactory().id) # lint-amnesty, pylint: disable=no-member
self.request_data = {
'course_ids': [self.course_id],
@@ -161,7 +161,7 @@ def test_course_access_endpoint_with_logged_out_user(self):
def test_course_access_endpoint_with_non_staff_user(self):
user = UserFactory(is_staff=False)
- self.client.login(username=user.username, password=UserFactory._DEFAULT_PASSWORD) # lint-amnesty, pylint: disable=protected-access
+ self.client.login(username=user.username, password=UserFactory._DEFAULT_PASSWORD) # pylint: disable=protected-access
response = self.client.get(self.url, data=self.request_data)
assert response.status_code == 403
diff --git a/openedx/core/djangoapps/enrollments/api.py b/openedx/core/djangoapps/enrollments/api.py
index c096eda8dbc4..d3e55d88e2ee 100644
--- a/openedx/core/djangoapps/enrollments/api.py
+++ b/openedx/core/djangoapps/enrollments/api.py
@@ -324,7 +324,7 @@ def update_enrollment(
}
"""
- log.info('Starting Update Enrollment process for user {user} in course {course} to mode {mode}'.format( # noqa: UP032 # pylint: disable=line-too-long
+ log.info('Starting Update Enrollment process for user {user} in course {course} to mode {mode}'.format( # noqa: UP032
user=username,
course=course_id,
mode=mode,
@@ -406,7 +406,7 @@ def get_course_enrollment_details(course_id, include_expired=False):
except Exception:
# Catch any unexpected errors during caching.
log.exception("Error occurred while caching course enrollment details for course %s", course_id)
- raise errors.CourseEnrollmentError("An unexpected error occurred while retrieving course enrollment details.") # lint-amnesty, pylint: disable=raise-missing-from,line-too-long # noqa: B904
+ raise errors.CourseEnrollmentError("An unexpected error occurred while retrieving course enrollment details.") # pylint: disable=raise-missing-from # noqa: B904
return course_enrollment_details
diff --git a/openedx/core/djangoapps/enrollments/data.py b/openedx/core/djangoapps/enrollments/data.py
index 87cd6e424a3e..ba5d12d228e7 100644
--- a/openedx/core/djangoapps/enrollments/data.py
+++ b/openedx/core/djangoapps/enrollments/data.py
@@ -160,7 +160,7 @@ def create_course_enrollment(username, course_id, mode, is_active, enterprise_uu
raise CourseEnrollmentFullError(str(err)) # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904
except AlreadyEnrolledError as err:
enrollment = get_course_enrollment(username, course_id)
- raise CourseEnrollmentExistsError(str(err), enrollment) # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904
+ raise CourseEnrollmentExistsError(str(err), enrollment) # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904, E501
def update_course_enrollment(username, course_id, mode=None, is_active=None):
@@ -260,7 +260,7 @@ def unenroll_user_from_all_courses(username):
for enrollment in enrollments:
_update_enrollment(enrollment, is_active=False)
- return {str(enrollment.course_id.org) for enrollment in enrollments} # lint-amnesty, pylint: disable=consider-using-set-comprehension
+ return {str(enrollment.course_id.org) for enrollment in enrollments} # pylint: disable=consider-using-set-comprehension
def _get_user(username):
diff --git a/openedx/core/djangoapps/enrollments/forms.py b/openedx/core/djangoapps/enrollments/forms.py
index 01b1bde61e39..54dc8666ad09 100644
--- a/openedx/core/djangoapps/enrollments/forms.py
+++ b/openedx/core/djangoapps/enrollments/forms.py
@@ -30,7 +30,7 @@ def clean_course_id(self):
try:
return CourseKey.from_string(course_id)
except InvalidKeyError:
- raise ValidationError(f"'{course_id}' is not a valid course id.") # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904
+ raise ValidationError(f"'{course_id}' is not a valid course id.") # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904, E501
return course_id
def clean_username(self):
diff --git a/openedx/core/djangoapps/enrollments/tests/test_data.py b/openedx/core/djangoapps/enrollments/tests/test_data.py
index 304748bc5a63..fdfd23c01704 100644
--- a/openedx/core/djangoapps/enrollments/tests/test_data.py
+++ b/openedx/core/djangoapps/enrollments/tests/test_data.py
@@ -12,7 +12,7 @@
from common.djangoapps.course_modes.models import CourseMode
from common.djangoapps.course_modes.tests.factories import CourseModeFactory
-from common.djangoapps.student.models import ( # lint-amnesty, pylint: disable=line-too-long
+from common.djangoapps.student.models import (
AlreadyEnrolledError,
CourseEnrollment,
CourseFullError,
diff --git a/openedx/core/djangoapps/enrollments/views.py b/openedx/core/djangoapps/enrollments/views.py
index 4796ee9d3c43..102900a9880b 100644
--- a/openedx/core/djangoapps/enrollments/views.py
+++ b/openedx/core/djangoapps/enrollments/views.py
@@ -16,7 +16,7 @@
from edx_rest_framework_extensions.auth.jwt.authentication import ( # lint-amnesty, pylint: disable=wrong-import-order
JwtAuthentication,
)
-from edx_rest_framework_extensions.auth.session.authentication import ( # lint-amnesty, pylint: disable=wrong-import-order
+from edx_rest_framework_extensions.auth.session.authentication import ( # pylint: disable=wrong-import-order
SessionAuthenticationAllowInactiveUser,
)
from opaque_keys import InvalidKeyError # lint-amnesty, pylint: disable=wrong-import-order
@@ -384,7 +384,7 @@ def get(self, request, course_id=None):
except CourseNotFoundError:
return Response(
status=status.HTTP_400_BAD_REQUEST,
- data={"message": ("No course found for course ID '{course_id}'").format(course_id=course_id)}, # noqa: UP032 # pylint: disable=line-too-long
+ data={"message": ("No course found for course ID '{course_id}'").format(course_id=course_id)}, # noqa: UP032
)
@@ -662,7 +662,7 @@ def get(self, request):
return Response(
status=status.HTTP_400_BAD_REQUEST,
data={
- "message": ("An error occurred while retrieving enrollments for user '{username}'").format( # noqa: UP032 # pylint: disable=line-too-long
+ "message": ("An error occurred while retrieving enrollments for user '{username}'").format( # noqa: UP032
username=username
)
},
@@ -746,7 +746,7 @@ def post(self, request):
return Response(
status=status.HTTP_403_FORBIDDEN,
data={
- "message": "User does not have permission to create enrollment with mode [{mode}].".format( # noqa: UP032 # pylint: disable=line-too-long
+ "message": "User does not have permission to create enrollment with mode [{mode}].".format( # noqa: UP032
mode=mode
)
},
@@ -771,7 +771,7 @@ def post(self, request):
if is_active is not None and not isinstance(is_active, bool):
return Response(
status=status.HTTP_400_BAD_REQUEST,
- data={"message": ("'{value}' is an invalid enrollment activation status.").format(value=is_active)}, # noqa: UP032 # pylint: disable=line-too-long
+ data={"message": ("'{value}' is an invalid enrollment activation status.").format(value=is_active)}, # noqa: UP032
)
explicit_linked_enterprise = request.data.get("linked_enterprise_customer")
@@ -787,7 +787,7 @@ def post(self, request):
username,
course_id,
)
- raise CourseEnrollmentError(str(error)) # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904
+ raise CourseEnrollmentError(str(error)) # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904, E501
kwargs = {
"username": username,
"course_id": str(course_id),
@@ -802,7 +802,7 @@ def post(self, request):
return Response(
status=status.HTTP_400_BAD_REQUEST,
data={
- "message": ("'{value}' is an invalid force enrollment status.").format(value=force_enrollment) # noqa: UP032 # pylint: disable=line-too-long
+ "message": ("'{value}' is an invalid force enrollment status.").format(value=force_enrollment) # noqa: UP032
},
)
# Only a staff user role can enroll a user forcefully
@@ -826,7 +826,7 @@ def post(self, request):
return Response(status=status.HTTP_400_BAD_REQUEST, data={"message": msg})
if missing_attrs:
- msg = "Missing enrollment attributes: requested mode={} required attributes={}".format( # noqa: UP032 # pylint: disable=line-too-long
+ msg = "Missing enrollment attributes: requested mode={} required attributes={}".format( # noqa: UP032
mode, REQUIRED_ATTRIBUTES.get(mode)
)
log.warning(msg)
diff --git a/openedx/core/djangoapps/external_user_ids/admin.py b/openedx/core/djangoapps/external_user_ids/admin.py
index 86be19a9db96..efc1adaf9acd 100644
--- a/openedx/core/djangoapps/external_user_ids/admin.py
+++ b/openedx/core/djangoapps/external_user_ids/admin.py
@@ -47,7 +47,7 @@ def _generate_results_msg(self, user_id_list, unknown_users, created_id_list, ex
f'External IDs already exist for: {existing_id}\n'
)
- def process_generate_ids_request(self, user_id_list, id_type, request, redirect_url): # lint-amnesty, pylint: disable=missing-function-docstring
+ def process_generate_ids_request(self, user_id_list, id_type, request, redirect_url): # pylint: disable=missing-function-docstring
created_id_list = []
existing_id = []
@@ -55,7 +55,7 @@ def process_generate_ids_request(self, user_id_list, id_type, request, redirect_
id__in=user_id_list
)
for user in user_list:
- new_external_id, created = ExternalId.objects.get_or_create( # lint-amnesty, pylint: disable=unused-variable
+ new_external_id, created = ExternalId.objects.get_or_create( # pylint: disable=unused-variable
user=user,
external_id_type=id_type,
)
diff --git a/openedx/core/djangoapps/heartbeat/runchecks.py b/openedx/core/djangoapps/heartbeat/runchecks.py
index 792c14aa41dc..60fbbd5bf4ed 100644
--- a/openedx/core/djangoapps/heartbeat/runchecks.py
+++ b/openedx/core/djangoapps/heartbeat/runchecks.py
@@ -35,7 +35,7 @@ def runchecks(include_extended=False):
'message': message
}
except ImportError as e:
- raise ImproperlyConfigured(f'Error importing module {module}: "{e}"') # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904
+ raise ImproperlyConfigured(f'Error importing module {module}: "{e}"') # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904, E501
except AttributeError:
- raise ImproperlyConfigured(f'Module "{module}" does not define a "{attr}" callable') # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904
+ raise ImproperlyConfigured(f'Module "{module}" does not define a "{attr}" callable') # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904, E501
return response_dict
diff --git a/openedx/core/djangoapps/lang_pref/api.py b/openedx/core/djangoapps/lang_pref/api.py
index d2b7bf7082f4..e3ca48b4a5a0 100644
--- a/openedx/core/djangoapps/lang_pref/api.py
+++ b/openedx/core/djangoapps/lang_pref/api.py
@@ -79,7 +79,7 @@ def all_languages():
alphabetically.
"""
- languages = [(lang[0], _(lang[1])) for lang in settings.ALL_LANGUAGES] # lint-amnesty, pylint: disable=translation-of-non-string
+ languages = [(lang[0], _(lang[1])) for lang in settings.ALL_LANGUAGES] # pylint: disable=translation-of-non-string
return sorted(languages, key=lambda lang: lang[1])
diff --git a/openedx/core/djangoapps/models/course_details.py b/openedx/core/djangoapps/models/course_details.py
index fade8a2813d3..0ae865812979 100644
--- a/openedx/core/djangoapps/models/course_details.py
+++ b/openedx/core/djangoapps/models/course_details.py
@@ -348,7 +348,7 @@ def parse_video_tag(raw_video):
if keystring_matcher:
return keystring_matcher.group(0)
else:
- logging.warn("ignoring the content because it doesn't not conform to expected pattern: " + raw_video) # lint-amnesty, pylint: disable=deprecated-method, logging-not-lazy
+ logging.warn("ignoring the content because it doesn't not conform to expected pattern: " + raw_video) # pylint: disable=deprecated-method, logging-not-lazy
return None
@staticmethod
diff --git a/openedx/core/djangoapps/notifications/tests/test_notification_grouping.py b/openedx/core/djangoapps/notifications/tests/test_notification_grouping.py
index 7501f6a16ea0..4d7deed0860e 100644
--- a/openedx/core/djangoapps/notifications/tests/test_notification_grouping.py
+++ b/openedx/core/djangoapps/notifications/tests/test_notification_grouping.py
@@ -73,7 +73,7 @@ def test_group(self):
updated_context = NewPostGrouper().group(new_notification, old_notification)
self.assertTrue(updated_context['grouped']) # noqa: PT009
- self.assertEqual(updated_context['replier_name'], new_notification.content_context['replier_name']) # noqa: PT009 # pylint: disable=line-too-long
+ self.assertEqual(updated_context['replier_name'], new_notification.content_context['replier_name']) # noqa: PT009
def test_new_post_with_same_user(self):
"""
diff --git a/openedx/core/djangoapps/notifications/tests/test_tasks_with_account_level_pref.py b/openedx/core/djangoapps/notifications/tests/test_tasks_with_account_level_pref.py
index 8ba8646a1b06..f67a9ca0647a 100644
--- a/openedx/core/djangoapps/notifications/tests/test_tasks_with_account_level_pref.py
+++ b/openedx/core/djangoapps/notifications/tests/test_tasks_with_account_level_pref.py
@@ -405,7 +405,7 @@ def test_notification_is_created_when_any_channel_is_account_level(self, web_val
'username': 'user name',
},
}
- with patch('openedx.core.djangoapps.notifications.tasks.notification_generated_event') as event_mock: # noqa: F841 # pylint: disable=line-too-long
+ with patch('openedx.core.djangoapps.notifications.tasks.notification_generated_event') as event_mock: # noqa: F841
send_notifications(**kwargs)
notifications = Notification.objects.all()
assert len(notifications) == generated_count
diff --git a/openedx/core/djangoapps/notifications/tests/test_views.py b/openedx/core/djangoapps/notifications/tests/test_views.py
index 4622d3aec037..0e73cff09186 100644
--- a/openedx/core/djangoapps/notifications/tests/test_views.py
+++ b/openedx/core/djangoapps/notifications/tests/test_views.py
@@ -705,7 +705,7 @@ def test_get_notification_preferences(self, role_type, role, visible_apps, hidde
self.assertIn(app, notification_apps, msg=f"{app} should be visible for role: {role_type}") # noqa: PT009
for app in hidden_apps:
- self.assertNotIn(app, notification_apps, msg=f"{app} should NOT be visible for role: {role_type}") # noqa: PT009 # pylint: disable=line-too-long
+ self.assertNotIn(app, notification_apps, msg=f"{app} should NOT be visible for role: {role_type}") # noqa: PT009
if role_type == "forum":
role_instance.users.clear()
diff --git a/openedx/core/djangoapps/oauth_dispatch/dot_overrides/views.py b/openedx/core/djangoapps/oauth_dispatch/dot_overrides/views.py
index 9720240fc605..f5bf6a272faa 100644
--- a/openedx/core/djangoapps/oauth_dispatch/dot_overrides/views.py
+++ b/openedx/core/djangoapps/oauth_dispatch/dot_overrides/views.py
@@ -23,7 +23,6 @@ class EdxOAuth2AuthorizationView(AuthorizationView):
Restricted Applications support and custom filters.
"""
def get(self, request, *args, **kwargs):
- # pylint: disable=line-too-long
# Note: This code is copied from https://github.com/evonove/django-oauth-toolkit/blob/34f3b7b3511c15686039079026165feaadb1b87d/oauth2_provider/views/base.py#L111
# Places that we have changed are noted with ***.
application = None
@@ -46,7 +45,7 @@ def get(self, request, *args, **kwargs):
# at this point we know an Application instance with such client_id exists in the database
application = get_application_model().objects.get(client_id=credentials['client_id'])
try:
- content_orgs = list(ApplicationAccess.get_filter_values(application, ApplicationAccess.CONTENT_ORG_FILTER_NAME))
+ content_orgs = list(ApplicationAccess.get_filter_values(application, ApplicationAccess.CONTENT_ORG_FILTER_NAME)) # noqa: E501
except ApplicationAccess.DoesNotExist:
# No application access policy for this application exists.
# so we have no content orgs.
@@ -69,7 +68,7 @@ def get(self, request, *args, **kwargs):
# This is useful for in-house applications-> assume an in-house applications
# are already approved.
if application.skip_authorization:
- uri, headers, body, status = self.create_authorization_response( # lint-amnesty, pylint: disable=unused-variable
+ uri, headers, body, status = self.create_authorization_response( # pylint: disable=unused-variable
request=self.request, scopes=" ".join(scopes),
credentials=credentials, allow=True)
return OAuth2ResponseRedirect(uri, application.get_allowed_schemes())
diff --git a/openedx/core/djangoapps/oauth_dispatch/management/commands/edx_clear_expired_tokens.py b/openedx/core/djangoapps/oauth_dispatch/management/commands/edx_clear_expired_tokens.py
index fd22c0b727b1..a47578f58366 100644
--- a/openedx/core/djangoapps/oauth_dispatch/management/commands/edx_clear_expired_tokens.py
+++ b/openedx/core/djangoapps/oauth_dispatch/management/commands/edx_clear_expired_tokens.py
@@ -50,7 +50,7 @@ def add_arguments(self, parser):
self._add_boolean_flag(parser, 'grants', True)
self._add_boolean_flag(parser, 'revoked-tokens', True)
- def clear_table_data(self, query_set, batch_size, model, sleep_time): # lint-amnesty, pylint: disable=missing-function-docstring
+ def clear_table_data(self, query_set, batch_size, model, sleep_time): # pylint: disable=missing-function-docstring
total_deletions = 0
deletion_count = 1 # we expect to delete at least one row to start out with
while deletion_count:
diff --git a/openedx/core/djangoapps/oauth_dispatch/management/commands/generate_jwt_signing_key.py b/openedx/core/djangoapps/oauth_dispatch/management/commands/generate_jwt_signing_key.py
index a139cebca161..db18bc59792a 100644
--- a/openedx/core/djangoapps/oauth_dispatch/management/commands/generate_jwt_signing_key.py
+++ b/openedx/core/djangoapps/oauth_dispatch/management/commands/generate_jwt_signing_key.py
@@ -114,7 +114,7 @@ def handle(self, *args, **options):
'JWT_AUTH': public_keys,
}
jwt_auth_data['JWT_AUTH'].update(private_keys)
- with open(options['output_file'], 'w') as f_out: # lint-amnesty, pylint: disable=bad-option-value, open-builtin
+ with open(options['output_file'], 'w') as f_out: # pylint: disable=bad-option-value, open-builtin
yaml.safe_dump(jwt_auth_data, stream=f_out)
def _generate_key_id(self, size, chars=string.ascii_uppercase + string.digits):
diff --git a/openedx/core/djangoapps/oauth_dispatch/scopes.py b/openedx/core/djangoapps/oauth_dispatch/scopes.py
index bcaf6df91f7e..27c2eec58cc4 100644
--- a/openedx/core/djangoapps/oauth_dispatch/scopes.py
+++ b/openedx/core/djangoapps/oauth_dispatch/scopes.py
@@ -12,7 +12,7 @@ class ApplicationModelScopes(SettingsScopes):
"""
Scopes backend that determines available scopes using the ApplicationAccess model.
"""
- def get_available_scopes(self, application=None, request=None, *args, **kwargs): # lint-amnesty, pylint: disable=keyword-arg-before-vararg
+ def get_available_scopes(self, application=None, request=None, *args, **kwargs): # pylint: disable=keyword-arg-before-vararg
""" Returns valid scopes configured for the given application. """
try:
application_scopes = ApplicationAccess.get_scopes(application)
diff --git a/openedx/core/djangoapps/oauth_dispatch/tests/test_views.py b/openedx/core/djangoapps/oauth_dispatch/tests/test_views.py
index b8e056f4064e..41dc9e2ad8a8 100644
--- a/openedx/core/djangoapps/oauth_dispatch/tests/test_views.py
+++ b/openedx/core/djangoapps/oauth_dispatch/tests/test_views.py
@@ -55,7 +55,7 @@ def login_with_access_token(self, access_token=None):
return self.client.post(
self.login_with_access_token_url,
- HTTP_AUTHORIZATION=f"Bearer {access_token if access_token else self.access_token}".encode('utf-8') # noqa: UP012 # pylint: disable=line-too-long
+ HTTP_AUTHORIZATION=f"Bearer {access_token if access_token else self.access_token}".encode('utf-8') # noqa: UP012
)
def _assert_access_token_is_valid(self, access_token=None):
diff --git a/openedx/core/djangoapps/password_policy/tests/test_hibp.py b/openedx/core/djangoapps/password_policy/tests/test_hibp.py
index 06daaa09c9f7..a9b8a113291c 100644
--- a/openedx/core/djangoapps/password_policy/tests/test_hibp.py
+++ b/openedx/core/djangoapps/password_policy/tests/test_hibp.py
@@ -53,7 +53,7 @@ def test_warning_log_on_timeout(self, mock_get): # pylint: disable=unused-argum
'Request timed out for {}'.format(password_hash_hex) # noqa: UP032
)
)
- assert 'Request timed out for {}'.format(password_hash_hex) in log_capture.records[0].getMessage() # noqa: UP032 # pylint: disable=line-too-long
+ assert 'Request timed out for {}'.format(password_hash_hex) in log_capture.records[0].getMessage() # noqa: UP032
def test_provided_string_is_sha1_or_not(self):
hashed_password = '8BB6118F8FD6935AD0876A3BE34A717D32708FFD'
diff --git a/openedx/core/djangoapps/plugin_api/views.py b/openedx/core/djangoapps/plugin_api/views.py
index 68610d3c3a94..e18b1bca49db 100644
--- a/openedx/core/djangoapps/plugin_api/views.py
+++ b/openedx/core/djangoapps/plugin_api/views.py
@@ -79,7 +79,7 @@ def add_fragment_resource_urls(self, fragment):
for js_file in self.js_dependencies():
fragment.add_javascript_url(staticfiles_storage.url(js_file))
- def create_base_standalone_context(self, request, fragment, **kwargs): # lint-amnesty, pylint: disable=unused-argument
+ def create_base_standalone_context(self, request, fragment, **kwargs): # pylint: disable=unused-argument
"""
Creates the base context for rendering a fragment as a standalone page.
"""
diff --git a/openedx/core/djangoapps/profile_images/images.py b/openedx/core/djangoapps/profile_images/images.py
index ca114c3569fb..9ba952151f88 100644
--- a/openedx/core/djangoapps/profile_images/images.py
+++ b/openedx/core/djangoapps/profile_images/images.py
@@ -226,7 +226,7 @@ def _get_valid_file_types():
"""
Return comma separated string of valid file types.
"""
- return ', '.join([', '.join(IMAGE_TYPES[ft].extensions) for ft in IMAGE_TYPES.keys()]) # lint-amnesty, pylint: disable=consider-iterating-dictionary
+ return ', '.join([', '.join(IMAGE_TYPES[ft].extensions) for ft in IMAGE_TYPES.keys()]) # pylint: disable=consider-iterating-dictionary
def _user_friendly_size(size):
diff --git a/openedx/core/djangoapps/profile_images/tests/helpers.py b/openedx/core/djangoapps/profile_images/tests/helpers.py
index 779ee3e79f30..34296896138f 100644
--- a/openedx/core/djangoapps/profile_images/tests/helpers.py
+++ b/openedx/core/djangoapps/profile_images/tests/helpers.py
@@ -28,7 +28,7 @@ def make_image_file(dimensions=(320, 240), prefix='tmp', extension='.jpeg', forc
"""
image = Image.new('RGB', dimensions, "green")
- image_file = NamedTemporaryFile(prefix=prefix, suffix=extension) # lint-amnesty, pylint: disable=consider-using-with
+ image_file = NamedTemporaryFile(prefix=prefix, suffix=extension) # pylint: disable=consider-using-with
try:
if orientation and orientation in range(1, 9):
exif_bytes = piexif.dump({'0th': {piexif.ImageIFD.Orientation: orientation}})
diff --git a/openedx/core/djangoapps/programs/__init__.py b/openedx/core/djangoapps/programs/__init__.py
index 8fc52e05f14e..04db422469a6 100644
--- a/openedx/core/djangoapps/programs/__init__.py
+++ b/openedx/core/djangoapps/programs/__init__.py
@@ -13,7 +13,7 @@
PROGRAMS_WAFFLE_SWITCH_NAMESPACE = 'programs'
# This is meant to be enabled until https://openedx.atlassian.net/browse/LEARNER-5573 needs to be resolved
-ALWAYS_CALCULATE_PROGRAM_PRICE_AS_ANONYMOUS_USER = WaffleSwitch( # lint-amnesty, pylint: disable=toggle-missing-annotation
+ALWAYS_CALCULATE_PROGRAM_PRICE_AS_ANONYMOUS_USER = WaffleSwitch( # pylint: disable=toggle-missing-annotation
f'{PROGRAMS_WAFFLE_SWITCH_NAMESPACE}.always_calculate_program_price_as_anonymous_user',
__name__
)
diff --git a/openedx/core/djangoapps/programs/api.py b/openedx/core/djangoapps/programs/api.py
index bf852c9c5c8c..db39dd682d3c 100644
--- a/openedx/core/djangoapps/programs/api.py
+++ b/openedx/core/djangoapps/programs/api.py
@@ -5,7 +5,7 @@
from .utils import is_user_enrolled_in_program_type as _is_user_enrolled_in_program_type
-def is_user_enrolled_in_program_type(user, program_type_slug, paid_modes_only=False, enrollments=None, entitlements=None): # lint-amnesty, pylint: disable=line-too-long
+def is_user_enrolled_in_program_type(user, program_type_slug, paid_modes_only=False, enrollments=None, entitlements=None): # noqa: E501
"""
This method will look at the learners Enrollments and Entitlements to determine
if a learner is enrolled in a Program of the given type.
diff --git a/openedx/core/djangoapps/programs/tests/test_utils.py b/openedx/core/djangoapps/programs/tests/test_utils.py
index 043367cfee5e..cc9498b215db 100644
--- a/openedx/core/djangoapps/programs/tests/test_utils.py
+++ b/openedx/core/djangoapps/programs/tests/test_utils.py
@@ -1380,7 +1380,7 @@ def setUp(self):
# Give all course runs a certificate URL, but only expect one to come
# back. This verifies the break in the function under test that ensures
# only one certificate per course comes back.
- for index, course_run in enumerate(course['course_runs']): # lint-amnesty, pylint: disable=unused-variable # noqa: B007
+ for index, course_run in enumerate(course['course_runs']): # lint-amnesty, pylint: disable=unused-variable # noqa: B007, E501
course_run['certificate_url'] = self.course_certificate_url
course_run['may_certify'] = True
@@ -1423,7 +1423,7 @@ def test_course_run_certificates_missing(self, mock_get_credentials):
"""
# make the first course have no certification, the second have no url...
for course_index, course in enumerate(self.program['courses']):
- for index, course_run in enumerate(course['course_runs']): # lint-amnesty, pylint: disable=unused-variable # noqa: B007
+ for index, course_run in enumerate(course['course_runs']): # lint-amnesty, pylint: disable=unused-variable # noqa: B007, E501
if course_index == 0:
course_run['may_certify'] = False
elif course_index == 1:
@@ -1590,7 +1590,7 @@ def test_fetching_program_discounted_price(self):
data = ProgramMarketingDataExtender(self.program, self.user).extend()
self._update_discount_data(mock_discount_data)
- assert httpretty.last_request().querystring.get('username')[0] == self.user.username # lint-amnesty, pylint: disable=no-member, line-too-long
+ assert httpretty.last_request().querystring.get('username')[0] == self.user.username # pylint: disable=no-member
assert data['skus'] == [course['course_runs'][0]['seats'][0]['sku'] for course in self.program['courses']]
assert data['discount_data'] == mock_discount_data
@@ -1614,7 +1614,7 @@ def test_fetching_program_price_when_forced_as_anonymous_user(self):
content_type='application/json'
)
ProgramMarketingDataExtender(self.program, self.user).extend()
- assert httpretty.last_request().querystring.get('is_anonymous')[0] == 'True' # lint-amnesty, pylint: disable=no-member, line-too-long
+ assert httpretty.last_request().querystring.get('is_anonymous')[0] == 'True' # pylint: disable=no-member
@httpretty.activate
def test_fetching_program_discounted_price_as_anonymous_user(self):
@@ -1639,7 +1639,7 @@ def test_fetching_program_discounted_price_as_anonymous_user(self):
data = ProgramMarketingDataExtender(self.program, user).extend()
self._update_discount_data(mock_discount_data)
- assert httpretty.last_request().querystring.get('is_anonymous', None) is not None # lint-amnesty, pylint: disable=no-member, line-too-long
+ assert httpretty.last_request().querystring.get('is_anonymous', None) is not None # pylint: disable=no-member
assert data['skus'] == [course['course_runs'][0]['seats'][0]['sku'] for course in self.program['courses']]
assert data['discount_data'] == mock_discount_data
@@ -1737,16 +1737,16 @@ def test_user_enrolled_in_paid_only_with_no_matching_paid_course_modes(self, moc
mock_get_programs_by_type.return_value = [self.program, second_program]
# While most of a programs courses would likely come with a paid mode, if the course in question is now expired,
- # then get_paid_modes_for_course would return an empty list. Even with no paid modes, if we request paid modes only # lint-amnesty, pylint: disable=line-too-long
+ # then get_paid_modes_for_course would return an empty list. Even with no paid modes, if we request paid modes only # noqa: E501
# we should return False
mock_get_paid_modes_for_course.return_value = []
# raise Exception((mock_get_programs_by_type, mock_get_paid_modes_for_course))
- assert not is_user_enrolled_in_program_type(user=self.user, program_type_slug=self.MICROBACHELORS, paid_modes_only=True)
+ assert not is_user_enrolled_in_program_type(user=self.user, program_type_slug=self.MICROBACHELORS, paid_modes_only=True) # noqa: E501
# We should continue to return false even if they do contain paid modes
Mode = namedtuple('Mode', ['slug']) # lint-amnesty, pylint: disable=unused-variable # noqa: F841
# mock_get_paid_modes_for_course.return_value = [Mode(CourseMode.VERIFIED)]
- assert not is_user_enrolled_in_program_type(user=self.user, program_type_slug=self.MICROBACHELORS, paid_modes_only=True)
+ assert not is_user_enrolled_in_program_type(user=self.user, program_type_slug=self.MICROBACHELORS, paid_modes_only=True) # noqa: E501
def test_user_with_entitlement_no_enrollment(self, mock_get_programs_by_type):
CourseEntitlementFactory.create(
diff --git a/openedx/core/djangoapps/programs/utils.py b/openedx/core/djangoapps/programs/utils.py
index c3993f93071e..3971a9a91a42 100644
--- a/openedx/core/djangoapps/programs/utils.py
+++ b/openedx/core/djangoapps/programs/utils.py
@@ -962,7 +962,7 @@ def _collect_instructors(self, course_run):
def is_user_enrolled_in_program_type(
user, program_type_slug, paid_modes_only=False, enrollments=None, entitlements=None
-): # lint-amnesty, pylint: disable=line-too-long
+):
"""
This method will look at the learners Enrollments and Entitlements to determine
if a learner is enrolled in a Program of the given type.
diff --git a/openedx/core/djangoapps/safe_sessions/middleware.py b/openedx/core/djangoapps/safe_sessions/middleware.py
index 6d11a5e4cf8d..9d71d03d9174 100644
--- a/openedx/core/djangoapps/safe_sessions/middleware.py
+++ b/openedx/core/djangoapps/safe_sessions/middleware.py
@@ -311,7 +311,7 @@ def _validate_cookie_params(session_id, user_id):
if not session_id or session_id == str(None):
# The session ID should always be valid in the cookie.
raise SafeCookieError(
- "SafeCookieData not created due to invalid value for session_id '{}' for user_id '{}'.".format( # noqa: UP032 # pylint: disable=line-too-long
+ "SafeCookieData not created due to invalid value for session_id '{}' for user_id '{}'.".format( # noqa: UP032
session_id,
user_id,
))
@@ -371,7 +371,7 @@ def process_request(self, request):
'safe_sessions.session_cookie_count',
request.headers.get('Cookie', '').count(settings.SESSION_COOKIE_NAME + '=')
)
- except: # pylint: disable=bare-except
+ except: # noqa: E722
pass
cookie_data_string = request.COOKIES.get(settings.SESSION_COOKIE_NAME)
@@ -391,7 +391,7 @@ def process_request(self, request):
# Save off for debugging and logging in _verify_user_and_log_mismatch
request.cookie_session_field = safe_cookie_data.session_id
- process_request_response = super().process_request(request) # Step 3 # lint-amnesty, pylint: disable=assignment-from-no-return, super-with-arguments
+ process_request_response = super().process_request(request) # Step 3 # pylint: disable=assignment-from-no-return, super-with-arguments # noqa: E501
if process_request_response:
# The process_request pipeline has been short circuited so
# return the response.
diff --git a/openedx/core/djangoapps/safe_sessions/tests/test_middleware.py b/openedx/core/djangoapps/safe_sessions/tests/test_middleware.py
index ae52a219e2fb..4959acf44490 100644
--- a/openedx/core/djangoapps/safe_sessions/tests/test_middleware.py
+++ b/openedx/core/djangoapps/safe_sessions/tests/test_middleware.py
@@ -719,7 +719,7 @@ def test_process_request_emails_match_with_toggle_enabled(
# Assert that the session and cookies are not affected
self.assertEqual(self.request.session.get('email'), self.user.email) # noqa: PT009
self.assertEqual(len(self.client.response.cookies), 1) # noqa: PT009
- self.assertEqual(self.client.response.cookies[settings.SESSION_COOKIE_NAME].value, 'authenticated') # noqa: PT009 # pylint: disable=line-too-long
+ self.assertEqual(self.client.response.cookies[settings.SESSION_COOKIE_NAME].value, 'authenticated') # noqa: PT009
# Assert that _mark_cookie_for_deletion not called
mock_mark_cookie_for_deletion.assert_not_called()
@@ -762,7 +762,7 @@ def test_process_request_emails_match_with_toggle_disabled(
# Assert that the session and cookies are not affected
self.assertEqual(self.request.session.get('email'), self.user.email) # noqa: PT009
self.assertEqual(len(self.client.response.cookies), 1) # noqa: PT009
- self.assertEqual(self.client.response.cookies[settings.SESSION_COOKIE_NAME].value, 'authenticated') # noqa: PT009 # pylint: disable=line-too-long
+ self.assertEqual(self.client.response.cookies[settings.SESSION_COOKIE_NAME].value, 'authenticated') # noqa: PT009
# Assert that _mark_cookie_for_deletion not called
mock_mark_cookie_for_deletion.assert_not_called()
@@ -851,7 +851,7 @@ def test_process_request_emails_mismatch_with_toggle_disabled(
# Assert that the session and cookies are not affected
self.assertNotEqual(self.request.session.get('email'), self.user.email) # noqa: PT009
self.assertEqual(len(self.client.response.cookies), 1) # noqa: PT009
- self.assertEqual(self.client.response.cookies[settings.SESSION_COOKIE_NAME].value, 'authenticated') # noqa: PT009 # pylint: disable=line-too-long
+ self.assertEqual(self.client.response.cookies[settings.SESSION_COOKIE_NAME].value, 'authenticated') # noqa: PT009
# Assert that _mark_cookie_for_deletion not called
mock_mark_cookie_for_deletion.assert_not_called()
@@ -887,7 +887,7 @@ def test_process_request_no_email_change_history_with_toggle_enabled(
# Assert that the session and cookies are not affected
self.assertEqual(len(self.client.response.cookies), 1) # noqa: PT009
- self.assertEqual(self.client.response.cookies[settings.SESSION_COOKIE_NAME].value, 'authenticated') # noqa: PT009 # pylint: disable=line-too-long
+ self.assertEqual(self.client.response.cookies[settings.SESSION_COOKIE_NAME].value, 'authenticated') # noqa: PT009
# Assert that _mark_cookie_for_deletion not called
mock_mark_cookie_for_deletion.assert_not_called()
@@ -923,7 +923,7 @@ def test_process_request_no_email_change_history_with_toggle_disabled(
# Assert that the session and cookies are not affected
self.assertEqual(len(self.client.response.cookies), 1) # noqa: PT009
- self.assertEqual(self.client.response.cookies[settings.SESSION_COOKIE_NAME].value, 'authenticated') # noqa: PT009 # pylint: disable=line-too-long
+ self.assertEqual(self.client.response.cookies[settings.SESSION_COOKIE_NAME].value, 'authenticated') # noqa: PT009
# Assert that _mark_cookie_for_deletion not called
mock_mark_cookie_for_deletion.assert_not_called()
diff --git a/openedx/core/djangoapps/schedules/admin.py b/openedx/core/djangoapps/schedules/admin.py
index f900bcb462d5..0d99f5a3b696 100644
--- a/openedx/core/djangoapps/schedules/admin.py
+++ b/openedx/core/djangoapps/schedules/admin.py
@@ -19,7 +19,7 @@ class ScheduleExperienceAdminInline(admin.StackedInline):
model = models.ScheduleExperience
-def _set_experience(db_name, human_name, modeladmin, request, queryset): # lint-amnesty, pylint: disable=redefined-outer-name
+def _set_experience(db_name, human_name, modeladmin, request, queryset): # pylint: disable=redefined-outer-name
"""
A django action which will set all selected schedules to the supplied experience.
The intended usage is with functools.partial to generate the action for each experience type
diff --git a/openedx/core/djangoapps/schedules/management/commands/__init__.py b/openedx/core/djangoapps/schedules/management/commands/__init__.py
index a8ccf39b38b6..7baefb53e8c4 100644
--- a/openedx/core/djangoapps/schedules/management/commands/__init__.py
+++ b/openedx/core/djangoapps/schedules/management/commands/__init__.py
@@ -12,7 +12,7 @@
from openedx.core.djangoapps.schedules.utils import PrefixedDebugLoggerMixin
-class SendEmailBaseCommand(PrefixedDebugLoggerMixin, BaseCommand): # lint-amnesty, pylint: disable=missing-class-docstring
+class SendEmailBaseCommand(PrefixedDebugLoggerMixin, BaseCommand): # pylint: disable=missing-class-docstring
async_send_task = None # define in subclass
# An iterable of day offsets (e.g. -7, -14, -21, -28, ...) that defines the days for
diff --git a/openedx/core/djangoapps/schedules/management/commands/setup_models_to_send_test_emails.py b/openedx/core/djangoapps/schedules/management/commands/setup_models_to_send_test_emails.py
index 5f6880b8bf1a..b3669d4b2dea 100644
--- a/openedx/core/djangoapps/schedules/management/commands/setup_models_to_send_test_emails.py
+++ b/openedx/core/djangoapps/schedules/management/commands/setup_models_to_send_test_emails.py
@@ -52,7 +52,7 @@ class ContentHighlightSchedule(ScheduleFactory):
A ScheduleFactory that creates a Schedule set up for a course highlights email.
"""
start_date = factory.Faker('date_time_between', start_date='-7d', end_date='-7d', tzinfo=ZoneInfo("UTC"))
- experience = factory.RelatedFactory(ScheduleExperienceFactory, 'schedule', experience_type=ScheduleExperience.EXPERIENCES.course_updates) # lint-amnesty, pylint: disable=line-too-long
+ experience = factory.RelatedFactory(ScheduleExperienceFactory, 'schedule', experience_type=ScheduleExperience.EXPERIENCES.course_updates) # noqa: E501
class Command(BaseCommand):
diff --git a/openedx/core/djangoapps/schedules/management/commands/tests/send_email_base.py b/openedx/core/djangoapps/schedules/management/commands/tests/send_email_base.py
index 20966c524207..1cd2edacd1ed 100644
--- a/openedx/core/djangoapps/schedules/management/commands/tests/send_email_base.py
+++ b/openedx/core/djangoapps/schedules/management/commands/tests/send_email_base.py
@@ -133,7 +133,7 @@ def _get_template_overrides(self):
templates_override[0]['OPTIONS']['string_if_invalid'] = "TEMPLATE WARNING - MISSING VARIABLE [%s]"
return templates_override
- def _schedule_factory(self, offset=None, **factory_kwargs): # lint-amnesty, pylint: disable=missing-function-docstring
+ def _schedule_factory(self, offset=None, **factory_kwargs): # pylint: disable=missing-function-docstring
_, _, target_day, upgrade_deadline = self._get_dates(offset=offset)
factory_kwargs.setdefault('start_date', target_day)
factory_kwargs.setdefault('upgrade_deadline', upgrade_deadline)
@@ -198,7 +198,7 @@ def test_resolver_send(self, mock_ace):
@patch.object(resolvers, 'set_custom_attribute')
def test_schedule_bin(self, schedule_count, mock_attribute, mock_ace):
with patch.object(self.task, 'async_send_task') as mock_schedule_send:
- current_day, offset, target_day, upgrade_deadline = self._get_dates() # lint-amnesty, pylint: disable=unused-variable
+ current_day, offset, target_day, upgrade_deadline = self._get_dates() # pylint: disable=unused-variable
schedules = [
self._schedule_factory() for _ in range(schedule_count)
]
@@ -235,7 +235,7 @@ def test_schedule_bin(self, schedule_count, mock_attribute, mock_ace):
assert not mock_ace.send.called
def test_no_course_overview(self):
- current_day, offset, target_day, upgrade_deadline = self._get_dates() # lint-amnesty, pylint: disable=unused-variable
+ current_day, offset, target_day, upgrade_deadline = self._get_dates() # pylint: disable=unused-variable
# Don't use CourseEnrollmentFactory since it creates a course overview
enrollment = CourseEnrollment.objects.create(
course_id=CourseKey.from_string('edX/toy/Not_2012_Fall'),
@@ -317,7 +317,7 @@ def test_site_config(self, this_org_list, other_org_list, expected_message_count
user1 = UserFactory.create(id=self._next_user_id())
user2 = UserFactory.create(id=user1.id + self.task.num_bins)
- current_day, offset, target_day, upgrade_deadline = self._get_dates() # lint-amnesty, pylint: disable=unused-variable
+ current_day, offset, target_day, upgrade_deadline = self._get_dates() # pylint: disable=unused-variable
self._schedule_factory(
enrollment__course__org=filtered_org,
@@ -343,7 +343,7 @@ def test_site_config(self, this_org_list, other_org_list, expected_message_count
@ddt.data(True, False)
def test_course_end(self, has_course_ended):
user1 = UserFactory.create(id=self._next_user_id())
- current_day, offset, target_day, upgrade_deadline = self._get_dates() # lint-amnesty, pylint: disable=unused-variable
+ current_day, offset, target_day, upgrade_deadline = self._get_dates() # pylint: disable=unused-variable
end_date_offset = -2 if has_course_ended else 2
self._schedule_factory(
@@ -365,7 +365,7 @@ def test_course_end(self, has_course_ended):
@patch.object(tasks, 'ace')
def test_multiple_target_schedules(self, mock_ace):
user = UserFactory.create()
- current_day, offset, target_day, upgrade_deadline = self._get_dates() # lint-amnesty, pylint: disable=unused-variable
+ current_day, offset, target_day, upgrade_deadline = self._get_dates() # pylint: disable=unused-variable
num_courses = 3
for course_index in range(num_courses):
self._schedule_factory(
@@ -396,8 +396,8 @@ def test_templates(self, message_count):
self._assert_template_for_offset(offset, message_count)
self.clear_caches()
- def _assert_template_for_offset(self, offset, message_count): # lint-amnesty, pylint: disable=missing-function-docstring
- current_day, offset, target_day, upgrade_deadline = self._get_dates(offset) # lint-amnesty, pylint: disable=unused-variable
+ def _assert_template_for_offset(self, offset, message_count): # pylint: disable=missing-function-docstring
+ current_day, offset, target_day, upgrade_deadline = self._get_dates(offset) # pylint: disable=unused-variable
user = UserFactory.create()
for course_index in range(message_count):
@@ -454,8 +454,8 @@ def _assert_template_for_offset(self, offset, message_count): # lint-amnesty, p
return mock_channel.deliver.mock_calls
- def _check_if_email_sent_for_experience(self, test_config): # lint-amnesty, pylint: disable=missing-function-docstring
- current_day, offset, target_day, _ = self._get_dates(offset=test_config.offset) # lint-amnesty, pylint: disable=unused-variable
+ def _check_if_email_sent_for_experience(self, test_config): # pylint: disable=missing-function-docstring
+ current_day, offset, target_day, _ = self._get_dates(offset=test_config.offset) # pylint: disable=unused-variable
kwargs = {
'offset': offset
diff --git a/openedx/core/djangoapps/schedules/management/commands/tests/test_send_course_update.py b/openedx/core/djangoapps/schedules/management/commands/tests/test_send_course_update.py
index 4df4df3a72a0..4995d66cedaf 100644
--- a/openedx/core/djangoapps/schedules/management/commands/tests/test_send_course_update.py
+++ b/openedx/core/djangoapps/schedules/management/commands/tests/test_send_course_update.py
@@ -91,7 +91,7 @@ def stop_highlights_patcher(self):
@ddt.data(
ExperienceTest(experience=ScheduleExperience.EXPERIENCES.default, offset=expected_offsets[0], email_sent=False),
- ExperienceTest(experience=ScheduleExperience.EXPERIENCES.course_updates, offset=expected_offsets[0], email_sent=True), # lint-amnesty, pylint: disable=line-too-long
+ ExperienceTest(experience=ScheduleExperience.EXPERIENCES.course_updates, offset=expected_offsets[0], email_sent=True), # noqa: E501
ExperienceTest(experience=None, offset=expected_offsets[0], email_sent=False),
)
def test_schedule_in_different_experience(self, test_config):
diff --git a/openedx/core/djangoapps/schedules/management/commands/tests/test_send_email_base_command.py b/openedx/core/djangoapps/schedules/management/commands/tests/test_send_email_base_command.py
index a048d642b3e3..027cc01563e6 100644
--- a/openedx/core/djangoapps/schedules/management/commands/tests/test_send_email_base_command.py
+++ b/openedx/core/djangoapps/schedules/management/commands/tests/test_send_email_base_command.py
@@ -69,4 +69,4 @@ def test_send_emails(self):
assert not kwarg.called
for offset in self.command.offsets:
- self.command.enqueue.assert_any_call(offset, arg, kwarg=kwarg) # lint-amnesty, pylint: disable=no-member
+ self.command.enqueue.assert_any_call(offset, arg, kwarg=kwarg) # pylint: disable=no-member
diff --git a/openedx/core/djangoapps/schedules/management/commands/tests/test_send_recurring_nudge.py b/openedx/core/djangoapps/schedules/management/commands/tests/test_send_recurring_nudge.py
index 3b47b85f26fa..d28cef49a8ab 100644
--- a/openedx/core/djangoapps/schedules/management/commands/tests/test_send_recurring_nudge.py
+++ b/openedx/core/djangoapps/schedules/management/commands/tests/test_send_recurring_nudge.py
@@ -25,7 +25,7 @@
'openedx.core.djangoapps.schedules.apps.SchedulesConfig' in settings.INSTALLED_APPS,
"Can't test schedules if the app isn't installed",
)
-class TestSendRecurringNudge(ScheduleUpsellTestMixin, ScheduleSendEmailTestMixin, CacheIsolationTestCase): # lint-amnesty, pylint: disable=missing-class-docstring
+class TestSendRecurringNudge(ScheduleUpsellTestMixin, ScheduleSendEmailTestMixin, CacheIsolationTestCase): # pylint: disable=missing-class-docstring
__test__ = True
# pylint: disable=protected-access
diff --git a/openedx/core/djangoapps/schedules/management/commands/tests/test_send_upgrade_reminder.py b/openedx/core/djangoapps/schedules/management/commands/tests/test_send_upgrade_reminder.py
index bd03380cf791..b11389e3c00c 100644
--- a/openedx/core/djangoapps/schedules/management/commands/tests/test_send_upgrade_reminder.py
+++ b/openedx/core/djangoapps/schedules/management/commands/tests/test_send_upgrade_reminder.py
@@ -31,7 +31,7 @@
@skip_unless_lms
@skipUnless('openedx.core.djangoapps.schedules.apps.SchedulesConfig' in settings.INSTALLED_APPS,
"Can't test schedules if the app isn't installed")
-class TestUpgradeReminder(ScheduleSendEmailTestMixin, CacheIsolationTestCase): # lint-amnesty, pylint: disable=missing-class-docstring
+class TestUpgradeReminder(ScheduleSendEmailTestMixin, CacheIsolationTestCase): # pylint: disable=missing-class-docstring
__test__ = True
resolver = resolvers.UpgradeReminderResolver
@@ -48,7 +48,7 @@ class TestUpgradeReminder(ScheduleSendEmailTestMixin, CacheIsolationTestCase):
@ddt.data(True, False)
@patch.object(tasks, 'ace')
def test_verified_learner(self, is_verified, mock_ace):
- current_day, offset, target_day, upgrade_deadline = self._get_dates() # lint-amnesty, pylint: disable=unused-variable
+ current_day, offset, target_day, upgrade_deadline = self._get_dates() # pylint: disable=unused-variable
schedule = self._schedule_factory(
enrollment__mode=CourseMode.VERIFIED if is_verified else CourseMode.AUDIT,
)
@@ -61,7 +61,7 @@ def test_verified_learner(self, is_verified, mock_ace):
assert mock_ace.send.called == (not is_verified)
def test_filter_out_verified_schedules(self):
- current_day, offset, target_day, upgrade_deadline = self._get_dates() # lint-amnesty, pylint: disable=unused-variable
+ current_day, offset, target_day, upgrade_deadline = self._get_dates() # pylint: disable=unused-variable
user = UserFactory.create()
schedules = [
@@ -92,7 +92,7 @@ def test_filter_out_verified_schedules(self):
@patch.object(tasks, 'ace')
def test_course_without_verified_mode(self, mock_ace):
- current_day, offset, target_day, upgrade_deadline = self._get_dates() # lint-amnesty, pylint: disable=unused-variable
+ current_day, offset, target_day, upgrade_deadline = self._get_dates() # pylint: disable=unused-variable
schedule = self._schedule_factory()
schedule.enrollment.course.modes.filter(mode_slug=CourseMode.VERIFIED).delete()
@@ -104,7 +104,7 @@ def test_course_without_verified_mode(self, mock_ace):
@ddt.data(
ExperienceTest(experience=ScheduleExperience.EXPERIENCES.default, offset=expected_offsets[0], email_sent=True),
- ExperienceTest(experience=ScheduleExperience.EXPERIENCES.course_updates, offset=expected_offsets[0], email_sent=False), # lint-amnesty, pylint: disable=line-too-long
+ ExperienceTest(experience=ScheduleExperience.EXPERIENCES.course_updates, offset=expected_offsets[0], email_sent=False), # noqa: E501
ExperienceTest(experience=None, offset=expected_offsets[0], email_sent=True),
)
def test_upgrade_reminder_experience(self, test_config):
diff --git a/openedx/core/djangoapps/schedules/resolvers.py b/openedx/core/djangoapps/schedules/resolvers.py
index 12f104f0291e..980d0f66b225 100644
--- a/openedx/core/djangoapps/schedules/resolvers.py
+++ b/openedx/core/djangoapps/schedules/resolvers.py
@@ -85,7 +85,7 @@ class BinnedSchedulesBaseResolver(PrefixedDebugLoggerMixin, RecipientResolver):
def __attrs_post_init__(self):
# TODO: in the next refactor of this task, pass in current_datetime instead of reproducing it here
- self.current_datetime = self.target_datetime - datetime.timedelta(days=self.day_offset) # lint-amnesty, pylint: disable=attribute-defined-outside-init
+ self.current_datetime = self.target_datetime - datetime.timedelta(days=self.day_offset) # pylint: disable=attribute-defined-outside-init
def send(self, msg_type): # lint-amnesty, pylint: disable=arguments-differ
for (user, language, context) in self.schedules_for_bin():
@@ -119,7 +119,7 @@ def get_schedules_with_target_date_by_bin_and_orgs(
target_day = _get_datetime_beginning_of_day(self.target_datetime)
schedule_day_equals_target_day_filter = {
f'courseenrollment__schedule__{self.schedule_date_field}__gte': target_day,
- f'courseenrollment__schedule__{self.schedule_date_field}__lt': target_day + datetime.timedelta(days=1), # lint-amnesty, pylint: disable=line-too-long
+ f'courseenrollment__schedule__{self.schedule_date_field}__lt': target_day + datetime.timedelta(days=1),
}
users = User.objects.filter(
courseenrollment__is_active=True,
@@ -384,7 +384,7 @@ def send(self, msg_type):
context,
)
LOG.info(
- 'Sending email to user: {} for Instructor-paced course with course-key: {} and language: {}'.format( # noqa: UP032 # pylint: disable=line-too-long
+ 'Sending email to user: {} for Instructor-paced course with course-key: {} and language: {}'.format( # noqa: UP032
user.username,
self.course_id,
language
@@ -414,7 +414,7 @@ def schedules_for_bin(self):
week_highlights = get_week_highlights(user, enrollment.course_id, week_num)
except CourseUpdateDoesNotExist:
LOG.warning(
- 'Weekly highlights for user {} in week {} of course {} does not exist or is disabled'.format( # noqa: UP032 # pylint: disable=line-too-long
+ 'Weekly highlights for user {} in week {} of course {} does not exist or is disabled'.format( # noqa: UP032
user, week_num, enrollment.course_id
)
)
@@ -478,7 +478,7 @@ def send(self): # lint-amnesty, pylint: disable=arguments-differ
)
)
LOG.info(
- 'Sending email to user: {} for Self-paced course with course-key: {} and language: {}'.format( # noqa: UP032 # pylint: disable=line-too-long
+ 'Sending email to user: {} for Self-paced course with course-key: {} and language: {}'.format( # noqa: UP032
user.username,
self.course_id,
language
diff --git a/openedx/core/djangoapps/schedules/signals.py b/openedx/core/djangoapps/schedules/signals.py
index 9165500cae50..1b1f8aa369ab 100644
--- a/openedx/core/djangoapps/schedules/signals.py
+++ b/openedx/core/djangoapps/schedules/signals.py
@@ -50,7 +50,7 @@ def create_schedule(sender, **kwargs): # pylint: disable=unused-argument
except Exception: # pylint: disable=broad-except
# We do not want to block the creation of a CourseEnrollment because of an error in creating a Schedule.
# No Schedule is acceptable, but no CourseEnrollment is not.
- log.exception('Encountered error in creating a Schedule for CourseEnrollment for user {} in course {}'.format( # noqa: UP032 # pylint: disable=line-too-long
+ log.exception('Encountered error in creating a Schedule for CourseEnrollment for user {} in course {}'.format( # noqa: UP032
enrollment.user.id if (enrollment and enrollment.user) else None,
enrollment.course_id if enrollment else None
))
@@ -87,7 +87,7 @@ def reset_schedule_on_mode_change(sender, user, course_key, mode, **kwargs): #
reset_self_paced_schedule(user, course_key, use_enrollment_date=use_enrollment_date)
-def _calculate_upgrade_deadline(course_id, content_availability_date): # lint-amnesty, pylint: disable=missing-function-docstring
+def _calculate_upgrade_deadline(course_id, content_availability_date): # pylint: disable=missing-function-docstring
upgrade_deadline = None
delta = _get_upgrade_deadline_delta_setting(course_id)
diff --git a/openedx/core/djangoapps/schedules/tasks.py b/openedx/core/djangoapps/schedules/tasks.py
index 70eb3d5a2820..6a0dcd29746f 100644
--- a/openedx/core/djangoapps/schedules/tasks.py
+++ b/openedx/core/djangoapps/schedules/tasks.py
@@ -104,9 +104,9 @@ class BinnedScheduleMessageBaseTask(ScheduleMessageBaseTask):
task_instance = None
@classmethod
- def enqueue(cls, site, current_date, day_offset, override_recipient_email=None, override_middlewares=None): # lint-amnesty, pylint: disable=missing-function-docstring
+ def enqueue(cls, site, current_date, day_offset, override_recipient_email=None, override_middlewares=None): # pylint: disable=missing-function-docstring
set_code_owner_attribute_from_module(__name__)
- current_date = resolvers._get_datetime_beginning_of_day(current_date) # lint-amnesty, pylint: disable=protected-access
+ current_date = resolvers._get_datetime_beginning_of_day(current_date) # pylint: disable=protected-access
if not cls.is_enqueue_enabled(site):
cls.log_info('Message queuing disabled for site %s', site.domain)
@@ -239,7 +239,7 @@ class ScheduleCourseNextSectionUpdate(ScheduleMessageBaseTask): # lint-amnesty,
task_instance = None
@classmethod
- def enqueue(cls, site, current_date, day_offset, override_recipient_email=None): # lint-amnesty, pylint: disable=missing-function-docstring
+ def enqueue(cls, site, current_date, day_offset, override_recipient_email=None): # pylint: disable=missing-function-docstring
set_code_owner_attribute_from_module(__name__)
target_datetime = (current_date - datetime.timedelta(days=day_offset))
@@ -261,7 +261,7 @@ def enqueue(cls, site, current_date, day_offset, override_recipient_email=None):
retry=False,
)
- def run(self, site_id, target_day_str, course_key, override_recipient_email=None): # lint-amnesty, pylint: disable=arguments-differ
+ def run(self, site_id, target_day_str, course_key, override_recipient_email=None): # pylint: disable=arguments-differ
set_code_owner_attribute_from_module(__name__)
site = Site.objects.select_related('configuration').get(id=site_id)
with emulate_http_request(site=site):
@@ -278,7 +278,7 @@ def run(self, site_id, target_day_str, course_key, override_recipient_email=None
ScheduleCourseNextSectionUpdate = ScheduleCourseNextSectionUpdate.task_instance
-def _schedule_send(msg_str, site_id, delivery_config_var, log_prefix): # lint-amnesty, pylint: disable=missing-function-docstring
+def _schedule_send(msg_str, site_id, delivery_config_var, log_prefix): # pylint: disable=missing-function-docstring
site = Site.objects.select_related('configuration').get(pk=site_id)
if _is_delivery_enabled(site, delivery_config_var, log_prefix):
msg = Message.from_string(msg_str)
@@ -338,7 +338,7 @@ def _is_delivery_enabled(site, delivery_config_var, log_prefix):
LOG.info('%s: Message delivery disabled for site %s', log_prefix, site.domain)
-def _annotate_for_monitoring(message_type, site, bin_num=None, target_day_str=None, day_offset=None, course_key=None): # lint-amnesty, pylint: disable=missing-function-docstring
+def _annotate_for_monitoring(message_type, site, bin_num=None, target_day_str=None, day_offset=None, course_key=None): # pylint: disable=missing-function-docstring
# This identifies the type of message being sent, for example: schedules.recurring_nudge3.
set_custom_attribute('message_name', f'{message_type.app_label}.{message_type.name}')
# The domain name of the site we are sending the message for.
diff --git a/openedx/core/djangoapps/schedules/tests/test_content_highlights.py b/openedx/core/djangoapps/schedules/tests/test_content_highlights.py
index fb8d4f3a1d04..e634fc4cc780 100644
--- a/openedx/core/djangoapps/schedules/tests/test_content_highlights.py
+++ b/openedx/core/djangoapps/schedules/tests/test_content_highlights.py
@@ -87,7 +87,7 @@ def test_course_with_no_highlights(self):
self._create_chapter(display_name="Week 1")
self._create_chapter(display_name="Week 2")
- self.course = self.store.get_course(self.course_key) # lint-amnesty, pylint: disable=attribute-defined-outside-init
+ self.course = self.store.get_course(self.course_key) # pylint: disable=attribute-defined-outside-init
assert len(self.course.get_children()) == 2
assert not course_has_highlights_from_store(self.course_key)
@@ -157,7 +157,7 @@ def test_get_next_section_highlights(self, mock_duration):
assert get_next_section_highlights(self.user, self.course_key, two_days_ago, three_days.date()) == (None, None)
assert get_next_section_highlights(self.user, self.course_key, two_days_ago, four_days.date()) ==\
(['final week!'], 4)
- exception_message = f'Last section was reached. There are no more highlights for {self.course_key}' # noqa: F841 # pylint: disable=line-too-long
+ exception_message = f'Last section was reached. There are no more highlights for {self.course_key}' # noqa: F841
with pytest.raises(CourseUpdateDoesNotExist):
get_next_section_highlights(self.user, self.course_key, two_days_ago, six_days.date())
diff --git a/openedx/core/djangoapps/schedules/tests/test_tasks.py b/openedx/core/djangoapps/schedules/tests/test_tasks.py
index 99f790e35b01..f88729e5bdc1 100644
--- a/openedx/core/djangoapps/schedules/tests/test_tasks.py
+++ b/openedx/core/djangoapps/schedules/tests/test_tasks.py
@@ -25,7 +25,7 @@
@skip_unless_lms
@skipUnless('openedx.core.djangoapps.schedules.apps.SchedulesConfig' in settings.INSTALLED_APPS,
"Can't test schedules if the app isn't installed")
-class TestBinnedScheduleMessageBaseTask(CacheIsolationTestCase): # lint-amnesty, pylint: disable=missing-class-docstring
+class TestBinnedScheduleMessageBaseTask(CacheIsolationTestCase): # pylint: disable=missing-class-docstring
def setUp(self):
super().setUp()
diff --git a/openedx/core/djangoapps/service_status/views.py b/openedx/core/djangoapps/service_status/views.py
index b23115bf3676..970c58abe723 100644
--- a/openedx/core/djangoapps/service_status/views.py
+++ b/openedx/core/djangoapps/service_status/views.py
@@ -25,7 +25,7 @@ def celery_status(_):
A view that returns Celery stats
"""
stats = celery.control.inspect().stats() or {}
- return HttpResponse(json.dumps(stats, indent=4), # lint-amnesty, pylint: disable=http-response-with-content-type-json, http-response-with-json-dumps
+ return HttpResponse(json.dumps(stats, indent=4), # pylint: disable=http-response-with-content-type-json, http-response-with-json-dumps
content_type="application/json")
@@ -52,5 +52,5 @@ def celery_ping(_):
'time': time.time() - start,
}
- return HttpResponse(json.dumps(output, indent=4), # lint-amnesty, pylint: disable=http-response-with-content-type-json, http-response-with-json-dumps
+ return HttpResponse(json.dumps(output, indent=4), # pylint: disable=http-response-with-content-type-json, http-response-with-json-dumps
content_type="application/json")
diff --git a/openedx/core/djangoapps/session_inactivity_timeout/middleware.py b/openedx/core/djangoapps/session_inactivity_timeout/middleware.py
index 9e02892378fd..40119d133ef8 100644
--- a/openedx/core/djangoapps/session_inactivity_timeout/middleware.py
+++ b/openedx/core/djangoapps/session_inactivity_timeout/middleware.py
@@ -42,7 +42,7 @@ def process_request(self, request):
# .. setting_name: SESSION_INACTIVITY_TIMEOUT_IN_SECONDS
# .. setting_default: None
# .. setting_description: If set, this is used to end the session when there is no activity for N seconds.
- # .. setting_warning: Keep in sync with SESSION_COOKIE_AGE and must be larger than SESSION_ACTIVITY_SAVE_DELAY_SECONDS.
+ # .. setting_warning: Keep in sync with SESSION_COOKIE_AGE and must be larger than SESSION_ACTIVITY_SAVE_DELAY_SECONDS. # noqa: E501
timeout_in_seconds = getattr(settings, "SESSION_INACTIVITY_TIMEOUT_IN_SECONDS", None)
current_time = datetime.utcnow()
@@ -89,13 +89,13 @@ def process_request(self, request):
# If parsing fails, log warning and then treat as if no timestamp exists
log.warning("Parsing last touch time failed: %s", e)
# .. custom_attribute_name: session_inactivity.last_touch_error
- # .. custom_attribute_description: Boolean. True if parsing the last activity timestamp failed for this request, indicating a session data error.
+ # .. custom_attribute_description: Boolean. True if parsing the last activity timestamp failed for this request, indicating a session data error. # noqa: E501
monitoring_utils.set_custom_attribute('session_inactivity.last_touch_error', str(e))
monitoring_utils.record_exception()
else:
# .. custom_attribute_name: session_inactivity.first_login
- # .. custom_attribute_description: Boolean. True if the user has no stored activity timestamp for this request.
+ # .. custom_attribute_description: Boolean. True if the user has no stored activity timestamp for this request. # noqa: E501
monitoring_utils.set_custom_attribute('session_inactivity.first_login', True)
log.debug("No previous activity timestamp found (first login)")
diff --git a/openedx/core/djangoapps/session_inactivity_timeout/tests/test_middleware.py b/openedx/core/djangoapps/session_inactivity_timeout/tests/test_middleware.py
index 0d886635f6e8..9d5d0ccda9b6 100644
--- a/openedx/core/djangoapps/session_inactivity_timeout/tests/test_middleware.py
+++ b/openedx/core/djangoapps/session_inactivity_timeout/tests/test_middleware.py
@@ -111,7 +111,7 @@ def test_process_request_timeout_behavior(
mock_datetime.utcnow.return_value = current_time
mock_datetime.fromisoformat = datetime.fromisoformat
- response = self.middleware.process_request(self.request) # lint-amnesty, pylint: disable=assignment-from-none
+ response = self.middleware.process_request(self.request) # pylint: disable=assignment-from-none
assert response is None
@@ -154,7 +154,7 @@ def test_process_request_save_behavior(
mock_datetime.utcnow.return_value = current_time
mock_datetime.fromisoformat = datetime.fromisoformat
- response = self.middleware.process_request(self.request) # lint-amnesty, pylint: disable=assignment-from-none
+ response = self.middleware.process_request(self.request) # pylint: disable=assignment-from-none
assert response is None
assert self.request.user.is_authenticated
diff --git a/openedx/core/djangoapps/site_configuration/models.py b/openedx/core/djangoapps/site_configuration/models.py
index 3bf23e851f73..29253e2fa614 100644
--- a/openedx/core/djangoapps/site_configuration/models.py
+++ b/openedx/core/djangoapps/site_configuration/models.py
@@ -180,8 +180,7 @@ class Meta:
ordering = ('-modified', '-created',)
def __str__(self):
- # pylint: disable=line-too-long
- return "".format( # xss-lint: disable=python-wrap-html # noqa: UP032
+ return "".format( # xss-lint: disable=python-wrap-html # noqa: E501, UP032
modified=self.modified,
site=self.site,
)
diff --git a/openedx/core/djangoapps/theming/helpers_dirs.py b/openedx/core/djangoapps/theming/helpers_dirs.py
index 3f7fc22c185d..bde8b51df8d8 100644
--- a/openedx/core/djangoapps/theming/helpers_dirs.py
+++ b/openedx/core/djangoapps/theming/helpers_dirs.py
@@ -145,7 +145,6 @@ def __hash__(self):
return hash((self.theme_dir_name, self.path))
def __str__(self):
- # pylint: disable=line-too-long
return f"" # xss-lint: disable=python-wrap-html
def __repr__(self):
diff --git a/openedx/core/djangoapps/theming/management/commands/create_sites_and_configurations.py b/openedx/core/djangoapps/theming/management/commands/create_sites_and_configurations.py
index 6ec171ce8f56..d0c7e2e62962 100644
--- a/openedx/core/djangoapps/theming/management/commands/create_sites_and_configurations.py
+++ b/openedx/core/djangoapps/theming/management/commands/create_sites_and_configurations.py
@@ -213,21 +213,21 @@ def handle(self, *args, **options):
if options['devstack']:
configuration_prefix = "devstack"
- self.discovery_oauth_complete_url = "http://discovery-{}.e2e.devstack:18381/complete/edx-oauth2/".format( # noqa: UP032 # pylint: disable=line-too-long
+ self.discovery_oauth_complete_url = "http://discovery-{}.e2e.devstack:18381/complete/edx-oauth2/".format( # noqa: UP032
self.dns_name
)
self.discovery_base_url_fmt = "http://discovery-{site_domain}:18381/"
- self.ecommerce_oauth_complete_url = "http://ecommerce-{}.e2e.devstack:18130/complete/edx-oauth2/".format( # noqa: UP032 # pylint: disable=line-too-long
+ self.ecommerce_oauth_complete_url = "http://ecommerce-{}.e2e.devstack:18130/complete/edx-oauth2/".format( # noqa: UP032
self.dns_name
)
self.ecommerce_base_url_fmt = "http://ecommerce-{site_domain}:18130/"
else:
configuration_prefix = "sandbox"
- self.discovery_oauth_complete_url = "https://discovery-{}.sandbox.edx.org/complete/edx-oauth2/".format( # noqa: UP032 # pylint: disable=line-too-long
+ self.discovery_oauth_complete_url = "https://discovery-{}.sandbox.edx.org/complete/edx-oauth2/".format( # noqa: UP032
self.dns_name
)
self.discovery_base_url_fmt = "https://discovery-{site_domain}/"
- self.ecommerce_oauth_complete_url = "https://ecommerce-{}.sandbox.edx.org/complete/edx-oauth2/".format( # noqa: UP032 # pylint: disable=line-too-long
+ self.ecommerce_oauth_complete_url = "https://ecommerce-{}.sandbox.edx.org/complete/edx-oauth2/".format( # noqa: UP032
self.dns_name
)
self.ecommerce_base_url_fmt = "https://ecommerce-{site_domain}/"
diff --git a/openedx/core/djangoapps/theming/templatetags/theme_pipeline.py b/openedx/core/djangoapps/theming/templatetags/theme_pipeline.py
index c27c8595efb0..720c362b8682 100644
--- a/openedx/core/djangoapps/theming/templatetags/theme_pipeline.py
+++ b/openedx/core/djangoapps/theming/templatetags/theme_pipeline.py
@@ -57,7 +57,7 @@ def stylesheet(parser, token): # pylint: disable=unused-argument
_, name = token.split_contents()
except ValueError:
raise template.TemplateSyntaxError( # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904
- '%r requires exactly one argument: the name of a group in the PIPELINE["STYLESHEETS"] setting' % # noqa: UP031 # pylint: disable=line-too-long
+ '%r requires exactly one argument: the name of a group in the PIPELINE["STYLESHEETS"] setting' % # noqa: UP031
token.split_contents()[0]
)
return ThemeStylesheetNode(name)
@@ -72,7 +72,7 @@ def javascript(parser, token): # pylint: disable=unused-argument
_, name = token.split_contents()
except ValueError:
raise template.TemplateSyntaxError( # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904
- '%r requires exactly one argument: the name of a group in the PIPELINE["JAVASCRIPT"] setting' % # noqa: UP031 # pylint: disable=line-too-long
+ '%r requires exactly one argument: the name of a group in the PIPELINE["JAVASCRIPT"] setting' % # noqa: UP031
token.split_contents()[0]
)
return ThemeJavascriptNode(name)
diff --git a/openedx/core/djangoapps/theming/views.py b/openedx/core/djangoapps/theming/views.py
index 463318e5278c..2962be1efc40 100644
--- a/openedx/core/djangoapps/theming/views.py
+++ b/openedx/core/djangoapps/theming/views.py
@@ -92,7 +92,7 @@ class ThemingAdministrationFragmentView(EdxFragmentView):
Fragment view to allow a user to administer theming.
"""
- def render_to_fragment(self, request, course_id=None, **kwargs): # lint-amnesty, pylint: disable=arguments-differ, unused-argument
+ def render_to_fragment(self, request, course_id=None, **kwargs): # pylint: disable=arguments-differ, unused-argument
"""
Renders the theming administration view as a fragment.
"""
diff --git a/openedx/core/djangoapps/user_api/accounts/api.py b/openedx/core/djangoapps/user_api/accounts/api.py
index 9a6da6ab44d2..01a08590e8f6 100644
--- a/openedx/core/djangoapps/user_api/accounts/api.py
+++ b/openedx/core/djangoapps/user_api/accounts/api.py
@@ -180,7 +180,7 @@ def update_account_settings(requesting_user, update, username=None):
_update_state_if_needed(update, user_profile)
except PreferenceValidationError as err:
- raise AccountValidationError(err.preference_errors) # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904
+ raise AccountValidationError(err.preference_errors) # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904, E501
except (AccountUpdateError, AccountValidationError) as err:
raise err
except Exception as err:
@@ -741,7 +741,7 @@ def _validate_email_doesnt_exist(email):
error_message = accounts.AUTHN_EMAIL_CONFLICT_MSG
if email is not None and email_exists_or_retired(email):
- raise errors.AccountEmailAlreadyExists(_(error_message)) # lint-amnesty, pylint: disable=translation-of-non-string
+ raise errors.AccountEmailAlreadyExists(_(error_message)) # pylint: disable=translation-of-non-string
def _validate_secondary_email_doesnt_exist(email):
@@ -775,7 +775,7 @@ def _validate_password_works_with_username(password, username=None):
:raises: errors.AccountPasswordInvalid
"""
if password == username:
- raise errors.AccountPasswordInvalid(accounts.PASSWORD_CANT_EQUAL_USERNAME_MSG) # lint-amnesty, pylint: disable=no-member
+ raise errors.AccountPasswordInvalid(accounts.PASSWORD_CANT_EQUAL_USERNAME_MSG) # pylint: disable=no-member
def _validate_type(data, type, err): # lint-amnesty, pylint: disable=redefined-builtin
diff --git a/openedx/core/djangoapps/user_api/accounts/tests/test_api.py b/openedx/core/djangoapps/user_api/accounts/tests/test_api.py
index db3f6b078118..5289bfe7ba6d 100644
--- a/openedx/core/djangoapps/user_api/accounts/tests/test_api.py
+++ b/openedx/core/djangoapps/user_api/accounts/tests/test_api.py
@@ -82,7 +82,7 @@ def create_account(self, username, password, email):
@skip_unless_lms
@ddt.ddt
@patch('common.djangoapps.student.views.management.render_to_response',
- Mock(side_effect=mock_render_to_response, autospec=True)) # lint-amnesty, pylint: disable=line-too-long
+ Mock(side_effect=mock_render_to_response, autospec=True))
class TestAccountApi(UserSettingsEventTestMixin, EmailTemplateTagMixin, CreateAccountMixin, RetirementTestCase):
"""
These tests specifically cover the parts of the API methods that are not covered by test_views.py.
diff --git a/openedx/core/djangoapps/user_api/accounts/tests/test_permissions.py b/openedx/core/djangoapps/user_api/accounts/tests/test_permissions.py
index 424a820f2dcc..62f148ead5ef 100644
--- a/openedx/core/djangoapps/user_api/accounts/tests/test_permissions.py
+++ b/openedx/core/djangoapps/user_api/accounts/tests/test_permissions.py
@@ -5,7 +5,7 @@
from django.test import RequestFactory, TestCase
-from common.djangoapps.student.tests.factories import ( # lint-amnesty, pylint: disable=line-too-long
+from common.djangoapps.student.tests.factories import (
AdminFactory,
ContentTypeFactory,
PermissionFactory,
diff --git a/openedx/core/djangoapps/user_api/accounts/tests/test_retirement_views.py b/openedx/core/djangoapps/user_api/accounts/tests/test_retirement_views.py
index 4f4309934374..946cd318013f 100644
--- a/openedx/core/djangoapps/user_api/accounts/tests/test_retirement_views.py
+++ b/openedx/core/djangoapps/user_api/accounts/tests/test_retirement_views.py
@@ -602,7 +602,7 @@ def test_success(self):
Basic test to make sure that users in two different orgs are returned.
"""
user_dicts, users = self.create_partner_reporting_statuses() # lint-amnesty, pylint: disable=unused-variable
- additional_dicts, additional_users = self.create_partner_reporting_statuses(courses=(self.course_awesome_org,)) # lint-amnesty, pylint: disable=unused-variable
+ additional_dicts, additional_users = self.create_partner_reporting_statuses(courses=(self.course_awesome_org,)) # pylint: disable=unused-variable
user_dicts += additional_dicts
self.assert_status_and_user_list(user_dicts)
@@ -1617,14 +1617,14 @@ def setUp(self):
ArticleRevision.objects.create(ip_address="ipaddresss", user=self.test_user, article=article)
# ManualEnrollmentAudit setup
- course_enrollment = CourseEnrollment.enroll(user=self.test_user, course_key=self.course.id) # lint-amnesty, pylint: disable=no-member
+ course_enrollment = CourseEnrollment.enroll(user=self.test_user, course_key=self.course.id) # pylint: disable=no-member
ManualEnrollmentAudit.objects.create(
enrollment=course_enrollment, reason=self.pii_standin, enrolled_email=self.pii_standin
)
# CreditRequest and CreditRequirementStatus setup
provider = CreditProvider.objects.create(provider_id="Hogwarts")
- credit_course = CreditCourse.objects.create(course_key=self.course.id) # lint-amnesty, pylint: disable=no-member
+ credit_course = CreditCourse.objects.create(course_key=self.course.id) # pylint: disable=no-member
CreditRequest.objects.create(
username=self.test_user.username,
course=credit_course,
diff --git a/openedx/core/djangoapps/user_api/accounts/tests/test_views.py b/openedx/core/djangoapps/user_api/accounts/tests/test_views.py
index 194c2f30a316..d1bea4a239ce 100644
--- a/openedx/core/djangoapps/user_api/accounts/tests/test_views.py
+++ b/openedx/core/djangoapps/user_api/accounts/tests/test_views.py
@@ -890,7 +890,7 @@ def test_patch_account_unknown_user(self, api_client, user):
# Note that language_proficiencies is tested below as there are multiple error and success conditions.
)
@ddt.unpack
- def test_patch_account(self, field, value, fails_validation_value=None, developer_validation_message=None): # noqa: PT028 # pylint: disable=line-too-long
+ def test_patch_account(self, field, value, fails_validation_value=None, developer_validation_message=None): # noqa: PT028
"""
Test the behavior of patch, when using the correct content_type.
"""
diff --git a/openedx/core/djangoapps/user_api/accounts/views.py b/openedx/core/djangoapps/user_api/accounts/views.py
index c900f0457389..b87a7a51df6e 100644
--- a/openedx/core/djangoapps/user_api/accounts/views.py
+++ b/openedx/core/djangoapps/user_api/accounts/views.py
@@ -133,7 +133,6 @@ def wrapper(self, request): # pylint: disable=missing-docstring
)
-# pylint: disable=line-too-long
class AccountViewSet(ViewSet):
"""View or update a user's account information."""
@@ -182,7 +181,7 @@ def list(self, request):
If the user makes the request for her own account, or makes a request for another account and has "is_staff" access, an HTTP 200 "OK" response is returned.
The response consists of a list of one or more user objects, in the same format as is returned for `GET /user/v1/accounts/{username}`.
- """
+ """ # noqa: E501
usernames = request.GET.get("username")
user_email = request.GET.get("email")
lms_user_id = request.GET.get("lms_user_id")
@@ -194,7 +193,7 @@ def list(self, request):
if is_email_retired(user_email):
can_cancel_retirement = True
retirement_id = None
- earliest_datetime = datetime.datetime.now(ZoneInfo("UTC")) - datetime.timedelta(days=settings.COOL_OFF_DAYS)
+ earliest_datetime = datetime.datetime.now(ZoneInfo("UTC")) - datetime.timedelta(days=settings.COOL_OFF_DAYS) # noqa: E501
try:
retirement_status = UserRetirementStatus.objects.get(
created__gt=earliest_datetime,
@@ -262,7 +261,7 @@ def search_emails(self, request):
"id": 8,
}
]
- """
+ """ # noqa: E501
if not request.user.is_staff:
return Response(
{"developer_message": "not_found", "user_message": "Not Found"}, status=status.HTTP_404_NOT_FOUND
@@ -342,7 +341,7 @@ def retrieve(self, request, username):
If a user who does not have "is_staff" access requests account information for a different user, only a subset of these fields is returned. The returned fields depend on the `ACCOUNT_VISIBILITY_CONFIGURATION` configuration setting and the visibility preference of the user for whom data is requested.
A user can view which account fields they have shared with other users by requesting their own username and providing the "view=shared" URL parameter.
- """
+ """ # noqa: E501
try:
account_settings = get_account_settings(request, [username], view=request.query_params.get("view"))
except UserNotFound:
@@ -388,7 +387,7 @@ def partial_update(self, request, username):
If a failure at the time of the update prevents the update, a 400 "Bad Request" error is returned. The JSON collection contains specific errors.
If the update is successful, updated user account data is returned.
- """
+ """ # noqa: E501
if request.content_type != MergePatchParser.media_type:
raise UnsupportedMediaType(request.content_type)
@@ -422,7 +421,6 @@ def partial_update(self, request, username):
return Response(account_settings)
-# pylint: enable=line-too-long
class NameChangeView(ViewSet):
diff --git a/openedx/core/djangoapps/user_api/helpers.py b/openedx/core/djangoapps/user_api/helpers.py
index e71880057417..5f12e51943a5 100644
--- a/openedx/core/djangoapps/user_api/helpers.py
+++ b/openedx/core/djangoapps/user_api/helpers.py
@@ -63,7 +63,7 @@ def _wrapped(*args, **kwargs):
func_name=func.__name__,
args=args,
kwargs=kwargs,
- exception=ex.developer_message if hasattr(ex, 'developer_message') else repr(ex) # lint-amnesty, pylint: disable=no-member
+ exception=ex.developer_message if hasattr(ex, 'developer_message') else repr(ex) # pylint: disable=no-member
)
LOGGER.warning(msg)
raise
@@ -79,7 +79,7 @@ def _wrapped(*args, **kwargs):
func_name=func.__name__,
args=args,
kwargs=kwargs,
- exception=ex.developer_message if hasattr(ex, 'developer_message') else repr(ex), # lint-amnesty, pylint: disable=no-member
+ exception=ex.developer_message if hasattr(ex, 'developer_message') else repr(ex), # pylint: disable=no-member
caller=caller.strip(),
)
LOGGER.exception(msg)
diff --git a/openedx/core/djangoapps/user_api/management/commands/cancel_user_retirement_request.py b/openedx/core/djangoapps/user_api/management/commands/cancel_user_retirement_request.py
index c9ac6ac4bf2c..4dba52613b7f 100644
--- a/openedx/core/djangoapps/user_api/management/commands/cancel_user_retirement_request.py
+++ b/openedx/core/djangoapps/user_api/management/commands/cancel_user_retirement_request.py
@@ -37,7 +37,7 @@ def handle(self, *args, **options):
original_email=email_address
)
except UserRetirementStatus.DoesNotExist:
- raise CommandError(f"No retirement request with email address '{email_address}' exists.") # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904
+ raise CommandError(f"No retirement request with email address '{email_address}' exists.") # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904, E501
# Check if the user has started the retirement process -or- not.
if retirement_status.current_state.state_name != 'PENDING':
diff --git a/openedx/core/djangoapps/user_api/management/commands/populate_retirement_states.py b/openedx/core/djangoapps/user_api/management/commands/populate_retirement_states.py
index faa55d46982a..41d9b97963de 100644
--- a/openedx/core/djangoapps/user_api/management/commands/populate_retirement_states.py
+++ b/openedx/core/djangoapps/user_api/management/commands/populate_retirement_states.py
@@ -69,7 +69,7 @@ def _check_current_users(self):
"""
if UserRetirementStatus.objects.exclude(current_state__state_name__in=REQUIRED_STATES).exists():
raise CommandError(
- 'Users are currently being processed. All users must be in one of these states to run this command: ' # noqa: UP032 # pylint: disable=line-too-long
+ 'Users are currently being processed. All users must be in one of these states to run this command: ' # noqa: UP032
'{}'.format(REQ_STR)
)
diff --git a/openedx/core/djangoapps/user_api/management/commands/sync_hubspot_contacts.py b/openedx/core/djangoapps/user_api/management/commands/sync_hubspot_contacts.py
index 2ae247cf7d7a..2067f50044f3 100644
--- a/openedx/core/djangoapps/user_api/management/commands/sync_hubspot_contacts.py
+++ b/openedx/core/djangoapps/user_api/management/commands/sync_hubspot_contacts.py
@@ -145,7 +145,7 @@ def _sync_with_hubspot(self, users_batch, site_conf):
response.raise_for_status()
return len(contacts)
except HTTPError as ex:
- message = 'An error occurred while syncing batch of contacts for site {domain}, {message}'.format( # noqa: UP032 # pylint: disable=line-too-long
+ message = 'An error occurred while syncing batch of contacts for site {domain}, {message}'.format( # noqa: UP032
domain=site_conf.site.domain, message=str(ex)
)
self.stderr.write(message)
@@ -227,4 +227,4 @@ def handle(self, *args, **options):
except Exception as ex:
traceback.print_exc()
- raise CommandError('Command failed with traceback %s' % str(ex)) # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904, UP031
+ raise CommandError('Command failed with traceback %s' % str(ex)) # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904, E501, UP031
diff --git a/openedx/core/djangoapps/user_api/management/tests/test_retire_user.py b/openedx/core/djangoapps/user_api/management/tests/test_retire_user.py
index 6de2287fc4ba..5b97f89d4aa9 100644
--- a/openedx/core/djangoapps/user_api/management/tests/test_retire_user.py
+++ b/openedx/core/djangoapps/user_api/management/tests/test_retire_user.py
@@ -11,7 +11,7 @@
from django.core.management import CommandError, call_command
from common.djangoapps.student.tests.factories import UserFactory # lint-amnesty, pylint: disable=wrong-import-order
-from openedx.core.djangoapps.user_api.accounts.tests.retirement_helpers import ( # lint-amnesty, pylint: disable=unused-import, wrong-import-order
+from openedx.core.djangoapps.user_api.accounts.tests.retirement_helpers import ( # pylint: disable=unused-import, wrong-import-order
setup_retirement_states, # noqa: F401
)
from openedx.core.djangolib.testing.utils import skip_unless_lms # lint-amnesty, pylint: disable=wrong-import-order
@@ -61,7 +61,7 @@ def remove_user_file():
@skip_unless_lms
-def test_successful_retire_with_userfile(setup_retirement_states): # lint-amnesty, pylint: disable=redefined-outer-name, unused-argument # noqa: F811
+def test_successful_retire_with_userfile(setup_retirement_states): # pylint: disable=redefined-outer-name, unused-argument # noqa: F811
user = UserFactory.create(username='user0', email="user0@example.com")
username = user.username
user_email = user.email
@@ -77,7 +77,7 @@ def test_successful_retire_with_userfile(setup_retirement_states): # lint-amnes
@skip_unless_lms
-def test_retire_user_with_usename_email_mismatch(setup_retirement_states): # lint-amnesty, pylint: disable=redefined-outer-name, unused-argument # noqa: F811
+def test_retire_user_with_usename_email_mismatch(setup_retirement_states): # pylint: disable=redefined-outer-name, unused-argument # noqa: F811
create_user_file(True)
with pytest.raises(CommandError, match=r'Could not find users with specified username and email '):
call_command('retire_user', user_file=user_file)
@@ -85,7 +85,7 @@ def test_retire_user_with_usename_email_mismatch(setup_retirement_states): # li
@skip_unless_lms
-def test_successful_retire_with_username_email(setup_retirement_states): # lint-amnesty, pylint: disable=redefined-outer-name, unused-argument # noqa: F811
+def test_successful_retire_with_username_email(setup_retirement_states): # pylint: disable=redefined-outer-name, unused-argument # noqa: F811
user = UserFactory.create(username='user0', email="user0@example.com")
username = user.username
user_email = user.email
@@ -99,7 +99,7 @@ def test_successful_retire_with_username_email(setup_retirement_states): # lint
@skip_unless_lms
-def test_retire_with_username_email_userfile(setup_retirement_states): # lint-amnesty, pylint: disable=redefined-outer-name, unused-argument # noqa: F811
+def test_retire_with_username_email_userfile(setup_retirement_states): # pylint: disable=redefined-outer-name, unused-argument # noqa: F811
user = UserFactory.create(username='user0', email="user0@example.com")
username = user.username
user_email = user.email
diff --git a/openedx/core/djangoapps/user_api/middleware.py b/openedx/core/djangoapps/user_api/middleware.py
index ef33b27ab4a2..938f7176c504 100644
--- a/openedx/core/djangoapps/user_api/middleware.py
+++ b/openedx/core/djangoapps/user_api/middleware.py
@@ -55,7 +55,7 @@ def process_response(self, request, response): # pylint: disable=unused-argumen
"""Exit the context if it exists."""
try:
tracker.get_tracker().exit_context(self.CONTEXT_NAME)
- except: # pylint: disable=bare-except
+ except: # noqa: E722
pass
return response
diff --git a/openedx/core/djangoapps/user_api/models.py b/openedx/core/djangoapps/user_api/models.py
index 2982e1ff764f..ec49c3660b02 100644
--- a/openedx/core/djangoapps/user_api/models.py
+++ b/openedx/core/djangoapps/user_api/models.py
@@ -343,7 +343,7 @@ def create_retirement(cls, user):
try:
pending = RetirementState.objects.all().order_by('state_execution_order')[0]
except IndexError:
- raise RetirementStateError('Default state does not exist! Populate retirement states to retire users.') # lint-amnesty, pylint: disable=raise-missing-from,line-too-long # noqa: B904
+ raise RetirementStateError('Default state does not exist! Populate retirement states to retire users.') # pylint: disable=raise-missing-from # noqa: B904
if cls.objects.filter(user=user).exists():
raise RetirementStateError(f'User {user} already has a retirement status row!')
@@ -407,7 +407,7 @@ def get_retirement_for_retirement_action(cls, username):
break
if retirement is None:
- raise UserRetirementStatus.DoesNotExist('{} does not have an exact match in UserRetirementStatus. ' # noqa: UP032 # pylint: disable=line-too-long
+ raise UserRetirementStatus.DoesNotExist('{} does not have an exact match in UserRetirementStatus. ' # noqa: UP032
'{} similar rows found.'.format(username, len(retirements)))
state = retirement.current_state
diff --git a/openedx/core/djangoapps/user_api/preferences/api.py b/openedx/core/djangoapps/user_api/preferences/api.py
index 76acf999ccf6..24d78d1e70ce 100644
--- a/openedx/core/djangoapps/user_api/preferences/api.py
+++ b/openedx/core/djangoapps/user_api/preferences/api.py
@@ -168,7 +168,7 @@ def update_user_preferences(requesting_user, update, user=None):
if serializer_is_dirty(serializer):
serializer.save()
except Exception as error:
- raise _create_preference_update_error(preference_key, preference_value, error) # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904
+ raise _create_preference_update_error(preference_key, preference_value, error) # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904, E501
else:
delete_user_preference(requesting_user, preference_key)
@@ -208,7 +208,7 @@ def set_user_preference(requesting_user, preference_key, preference_value, usern
try:
serializer.save()
except Exception as error:
- raise _create_preference_update_error(preference_key, preference_value, error) # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904
+ raise _create_preference_update_error(preference_key, preference_value, error) # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904, E501
@intercept_errors(UserAPIInternalError, ignore_errors=[UserAPIRequestError])
@@ -403,7 +403,7 @@ def validate_user_preference_serializer(serializer, preference_key, preference_v
raise PreferenceValidationError({
preference_key: {
"developer_message": format_string.format(preference_key=preference_key),
- "user_message": _(format_string).format(preference_key=preference_key) # lint-amnesty, pylint: disable=translation-of-non-string
+ "user_message": _(format_string).format(preference_key=preference_key) # pylint: disable=translation-of-non-string
}
})
if not serializer.is_valid():
@@ -412,7 +412,7 @@ def validate_user_preference_serializer(serializer, preference_key, preference_v
# messages into the strings only.
for key in errors:
errors[key] = [str(el) for el in errors[key]]
- developer_message = "Value '{preference_value}' not valid for preference '{preference_key}': {error}".format( # noqa: UP032 # pylint: disable=line-too-long
+ developer_message = "Value '{preference_value}' not valid for preference '{preference_key}': {error}".format( # noqa: UP032
preference_key=preference_key, preference_value=preference_value, error=errors
)
if "key" in serializer.errors:
@@ -430,7 +430,7 @@ def validate_user_preference_serializer(serializer, preference_key, preference_v
}
})
if preference_key == "time_zone" and preference_value not in common_timezones_set:
- developer_message = gettext_noop("Value '{preference_value}' not valid for preference '{preference_key}': Not in timezone set.") # pylint: disable=line-too-long
+ developer_message = gettext_noop("Value '{preference_value}' not valid for preference '{preference_key}': Not in timezone set.") # noqa: E501
user_message = gettext_noop("Value '{preference_value}' is not a valid time zone selection.")
raise PreferenceValidationError({
preference_key: {
diff --git a/openedx/core/djangoapps/user_api/preferences/tests/test_api.py b/openedx/core/djangoapps/user_api/preferences/tests/test_api.py
index dbc5b61539b4..4fa93994135b 100644
--- a/openedx/core/djangoapps/user_api/preferences/tests/test_api.py
+++ b/openedx/core/djangoapps/user_api/preferences/tests/test_api.py
@@ -438,7 +438,7 @@ def get_expected_validation_developer_message(preference_key, preference_value):
)
-def get_expected_key_error_user_message(preference_key, preference_value): # lint-amnesty, pylint: disable=unused-argument
+def get_expected_key_error_user_message(preference_key, preference_value): # pylint: disable=unused-argument
"""
Returns the expected user message for an invalid key.
"""
diff --git a/openedx/core/djangoapps/user_api/preferences/tests/test_views.py b/openedx/core/djangoapps/user_api/preferences/tests/test_views.py
index a554434c3395..55dbc5d53ab4 100644
--- a/openedx/core/djangoapps/user_api/preferences/tests/test_views.py
+++ b/openedx/core/djangoapps/user_api/preferences/tests/test_views.py
@@ -230,7 +230,7 @@ def test_update_preferences_bad_data(self):
)
assert response.data.get('field_errors', None)
field_errors = response.data["field_errors"]
- assert field_errors == {TOO_LONG_PREFERENCE_KEY: {'developer_message': get_expected_validation_developer_message(TOO_LONG_PREFERENCE_KEY, 'new_value'), 'user_message': get_expected_key_error_user_message(TOO_LONG_PREFERENCE_KEY, 'new_value')}, 'empty_pref_ȻħȺɍłɇs': {'developer_message': "Preference 'empty_pref_ȻħȺɍłɇs' cannot be set to an empty value.", 'user_message': "Preference 'empty_pref_ȻħȺɍłɇs' cannot be set to an empty value."}, 'time_zone': {'developer_message': "Value 'Asia/Africa' not valid for preference 'time_zone': Not in timezone set.", 'user_message': "Value 'Asia/Africa' is not a valid time zone selection."}} # pylint: disable=line-too-long
+ assert field_errors == {TOO_LONG_PREFERENCE_KEY: {'developer_message': get_expected_validation_developer_message(TOO_LONG_PREFERENCE_KEY, 'new_value'), 'user_message': get_expected_key_error_user_message(TOO_LONG_PREFERENCE_KEY, 'new_value')}, 'empty_pref_ȻħȺɍłɇs': {'developer_message': "Preference 'empty_pref_ȻħȺɍłɇs' cannot be set to an empty value.", 'user_message': "Preference 'empty_pref_ȻħȺɍłɇs' cannot be set to an empty value."}, 'time_zone': {'developer_message': "Value 'Asia/Africa' not valid for preference 'time_zone': Not in timezone set.", 'user_message': "Value 'Asia/Africa' is not a valid time zone selection."}} # noqa: E501
# Verify that GET returns the original preferences
response = self.send_get(self.client)
diff --git a/openedx/core/djangoapps/user_api/serializers.py b/openedx/core/djangoapps/user_api/serializers.py
index e411dd0e1c3a..d22491e5f28c 100644
--- a/openedx/core/djangoapps/user_api/serializers.py
+++ b/openedx/core/djangoapps/user_api/serializers.py
@@ -97,7 +97,7 @@ class CountryTimeZoneSerializer(serializers.Serializer): # pylint: disable=abst
description = serializers.CharField()
-class IDVerificationDetailsSerializer(serializers.Serializer): # lint-amnesty, pylint: disable=abstract-method, missing-class-docstring
+class IDVerificationDetailsSerializer(serializers.Serializer): # pylint: disable=abstract-method, missing-class-docstring
type = serializers.SerializerMethodField()
status = serializers.CharField()
expiration_datetime = serializers.DateTimeField()
diff --git a/openedx/core/djangoapps/user_api/tests/test_views.py b/openedx/core/djangoapps/user_api/tests/test_views.py
index 48507d54e986..7ee3fef2140c 100644
--- a/openedx/core/djangoapps/user_api/tests/test_views.py
+++ b/openedx/core/djangoapps/user_api/tests/test_views.py
@@ -55,10 +55,10 @@ def get_uri_for_pref(self, target_pref):
def assertUserIsValid(self, user):
"""Assert that the given user result is valid"""
- self.assertCountEqual(list(user.keys()), ["email", "id", "name", "username", "preferences", "url"]) # noqa: PT009 # pylint: disable=line-too-long
+ self.assertCountEqual(list(user.keys()), ["email", "id", "name", "username", "preferences", "url"]) # noqa: PT009
self.assertCountEqual( # noqa: PT009
list(user["preferences"].items()),
- [(pref.key, pref.value) for pref in self.prefs if pref.user.id == user["id"]] # lint-amnesty, pylint: disable=no-member
+ [(pref.key, pref.value) for pref in self.prefs if pref.user.id == user["id"]] # pylint: disable=no-member
)
self.assertSelfReferential(user)
diff --git a/openedx/core/djangoapps/user_api/verification_api/tests/test_views.py b/openedx/core/djangoapps/user_api/verification_api/tests/test_views.py
index b8f51ef79a59..1c48b7753a31 100644
--- a/openedx/core/djangoapps/user_api/verification_api/tests/test_views.py
+++ b/openedx/core/djangoapps/user_api/verification_api/tests/test_views.py
@@ -176,12 +176,12 @@ def get_expected_response(self, *args, **kwargs):
}]
def test_multiple_verification_types(self):
- self.manual_verification = ManualVerification.objects.create( # lint-amnesty, pylint: disable=attribute-defined-outside-init
+ self.manual_verification = ManualVerification.objects.create( # pylint: disable=attribute-defined-outside-init
user=self.user,
status='approved',
reason='testing'
)
- self.sso_verification = SSOVerificationFactory(user=self.user, status='approved') # lint-amnesty, pylint: disable=attribute-defined-outside-init
+ self.sso_verification = SSOVerificationFactory(user=self.user, status='approved') # pylint: disable=attribute-defined-outside-init
self.photo_verification.error_msg = 'tested_error'
self.photo_verification.error_code = 'error_code'
self.photo_verification.status = 'denied'
@@ -219,7 +219,7 @@ def test_multiple_verification_types(self):
assert json.loads(response.content.decode('utf-8')) == expected
def test_multiple_verification_instances(self):
- self.sso_verification = SSOVerificationFactory(user=self.user, status='approved') # lint-amnesty, pylint: disable=attribute-defined-outside-init
+ self.sso_verification = SSOVerificationFactory(user=self.user, status='approved') # pylint: disable=attribute-defined-outside-init
second_ss_photo_verification = SoftwareSecurePhotoVerification.objects.create(
user=self.user,
status='denied',
diff --git a/openedx/core/djangoapps/user_authn/tasks.py b/openedx/core/djangoapps/user_authn/tasks.py
index 5ca32fd8e445..9ccf752faab3 100644
--- a/openedx/core/djangoapps/user_authn/tasks.py
+++ b/openedx/core/djangoapps/user_authn/tasks.py
@@ -75,7 +75,7 @@ def send_activation_email(self, msg_string, from_address=None, site_id=None):
with emulate_http_request(site=site, user=user):
ace.send(msg)
except RecoverableChannelDeliveryError:
- log.info('Retrying sending email to user {dest_addr}, attempt # {attempt} of {max_attempts}'.format( # noqa: UP032 # pylint: disable=line-too-long
+ log.info('Retrying sending email to user {dest_addr}, attempt # {attempt} of {max_attempts}'.format( # noqa: UP032
dest_addr=dest_addr,
attempt=retries,
max_attempts=max_retries
diff --git a/openedx/core/djangoapps/user_authn/tests/test_tasks.py b/openedx/core/djangoapps/user_authn/tests/test_tasks.py
index 993bfcf0fffc..973a4d4483e2 100644
--- a/openedx/core/djangoapps/user_authn/tests/test_tasks.py
+++ b/openedx/core/djangoapps/user_authn/tests/test_tasks.py
@@ -50,7 +50,7 @@ def test_ComposeEmail(self):
@mock.patch('time.sleep', mock.Mock(return_value=None))
@mock.patch('openedx.core.djangoapps.user_authn.tasks.log')
- @mock.patch('openedx.core.djangoapps.user_authn.tasks.ace.send', mock.Mock(side_effect=RecoverableChannelDeliveryError(None, None))) # lint-amnesty, pylint: disable=line-too-long
+ @mock.patch('openedx.core.djangoapps.user_authn.tasks.ace.send', mock.Mock(side_effect=RecoverableChannelDeliveryError(None, None))) # noqa: E501
def test_RetrySendUntilFail(self, mock_log):
"""
Tests retries when the activation email doesn't send
@@ -63,7 +63,7 @@ def test_RetrySendUntilFail(self, mock_log):
# Asserts sending email retry logging.
for attempt in range(email_max_attempts):
mock_log.info.assert_any_call(
- 'Retrying sending email to user {dest_addr}, attempt # {attempt} of {max_attempts}'.format( # noqa: UP032 # pylint: disable=line-too-long
+ 'Retrying sending email to user {dest_addr}, attempt # {attempt} of {max_attempts}'.format( # noqa: UP032
dest_addr=self.student.email,
attempt=attempt,
max_attempts=email_max_attempts
diff --git a/openedx/core/djangoapps/user_authn/toggles.py b/openedx/core/djangoapps/user_authn/toggles.py
index 67da464cbb5f..22af60edf2bd 100644
--- a/openedx/core/djangoapps/user_authn/toggles.py
+++ b/openedx/core/djangoapps/user_authn/toggles.py
@@ -32,7 +32,7 @@ def should_redirect_to_authn_microfrontend():
# .. toggle_description: Set to True to enable auto-generation of usernames.
# .. toggle_use_cases: open_edx
# .. toggle_creation_date: 2024-02-20
-# .. toggle_warning: Changing this setting may affect user authentication, account management and discussions experience.
+# .. toggle_warning: Changing this setting may affect user authentication, account management and discussions experience. # noqa: E501
def is_auto_generated_username_enabled():
diff --git a/openedx/core/djangoapps/user_authn/views/login.py b/openedx/core/djangoapps/user_authn/views/login.py
index a4ac2cd24705..00517a0fcaa1 100644
--- a/openedx/core/djangoapps/user_authn/views/login.py
+++ b/openedx/core/djangoapps/user_authn/views/login.py
@@ -101,7 +101,7 @@ def _do_third_party_auth(request):
register_label_strong=HTML("{register_text} ").format(register_text=_("Register")),
)
- raise AuthFailedError(message, error_code="third-party-auth-with-no-linked-account") # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904
+ raise AuthFailedError(message, error_code="third-party-auth-with-no-linked-account") # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904, E501
def _get_user_by_email(email):
@@ -210,7 +210,7 @@ def _enforce_password_policy_compliance(request, user): # lint-amnesty, pylint:
send_password_reset_email_for_user(user, request)
# Prevent the login attempt.
- raise AuthFailedError(HTML(str(e)), error_code=e.__class__.__name__) # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904
+ raise AuthFailedError(HTML(str(e)), error_code=e.__class__.__name__) # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904, E501
def _log_and_raise_inactive_user_auth_error(unauthenticated_user):
@@ -357,7 +357,7 @@ def _track_user_login(user, request):
anonymous_id = ""
try:
anonymous_id = request.COOKIES.get('ajs_anonymous_id', "")
- except: # pylint: disable=bare-except
+ except: # noqa: E722
pass
segment.identify(
user.id,
@@ -753,7 +753,7 @@ class LoginSessionView(APIView):
@method_decorator(ensure_csrf_cookie)
def get(self, request, *args, **kwargs):
- return HttpResponse(get_login_session_form(request).to_json(), content_type="application/json") # lint-amnesty, pylint: disable=http-response-with-content-type-json
+ return HttpResponse(get_login_session_form(request).to_json(), content_type="application/json") # pylint: disable=http-response-with-content-type-json
@swagger_auto_schema(
request_body=login_user_schema,
@@ -800,4 +800,4 @@ def _parse_analytics_param_for_course_id(request):
modified_request["course_id"] = analytics.get("enroll_course_id")
except (ValueError, TypeError):
set_custom_attribute("shim_analytics_course_id", "parse-error")
- log.error("Could not parse analytics object sent to user API: {analytics}".format(analytics=analytics)) # noqa: UP032 # pylint: disable=line-too-long
+ log.error("Could not parse analytics object sent to user API: {analytics}".format(analytics=analytics)) # noqa: UP032
diff --git a/openedx/core/djangoapps/user_authn/views/password_reset.py b/openedx/core/djangoapps/user_authn/views/password_reset.py
index 934ee02cf8bb..cc6910d09a79 100644
--- a/openedx/core/djangoapps/user_authn/views/password_reset.py
+++ b/openedx/core/djangoapps/user_authn/views/password_reset.py
@@ -238,7 +238,7 @@ class PasswordResetView(APIView):
@method_decorator(ensure_csrf_cookie)
def get(self, request):
- return HttpResponse(get_password_reset_form().to_json(), content_type="application/json") # lint-amnesty, pylint: disable=http-response-with-content-type-json
+ return HttpResponse(get_password_reset_form().to_json(), content_type="application/json") # pylint: disable=http-response-with-content-type-json
@helpers.intercept_errors(errors.UserAPIInternalError, ignore_errors=[errors.UserAPIRequestError])
@@ -369,7 +369,7 @@ def __init__(self):
self.uidb64 = ''
self.uid_int = -1
- def _process_password_reset_success(self, request, token, uidb64, extra_context): # lint-amnesty, pylint: disable=missing-function-docstring
+ def _process_password_reset_success(self, request, token, uidb64, extra_context): # pylint: disable=missing-function-docstring
self.user = self.get_user(uidb64)
form = SetPasswordForm(self.user, request.POST)
if self.token_generator.check_token(self.user, token) and form.is_valid():
@@ -460,7 +460,7 @@ def _handle_primary_email_update(self, updated_user): # lint-amnesty, pylint: d
}
)
except ObjectDoesNotExist:
- log.error('Account recovery process initiated without AccountRecovery instance for user {username}' # noqa: UP032 # pylint: disable=line-too-long
+ log.error('Account recovery process initiated without AccountRecovery instance for user {username}' # noqa: UP032
.format(username=updated_user.username))
def _handle_password_creation(self, request, updated_user):
diff --git a/openedx/core/djangoapps/user_authn/views/register.py b/openedx/core/djangoapps/user_authn/views/register.py
index 563f73c235be..1bd43f28c575 100644
--- a/openedx/core/djangoapps/user_authn/views/register.py
+++ b/openedx/core/djangoapps/user_authn/views/register.py
@@ -362,7 +362,7 @@ def _track_user_registration(user, profile, params, third_party_provider, regist
anonymous_id = ""
try:
anonymous_id = request.COOKIES.get('ajs_anonymous_id', "")
- except: # pylint: disable=bare-except
+ except: # noqa: E722
pass
traits = {
'email': user.email,
@@ -554,7 +554,7 @@ def dispatch(self, request, *args, **kwargs):
@method_decorator(ensure_csrf_cookie)
def get(self, request):
- return HttpResponse(RegistrationFormFactory().get_registration_form(request).to_json(), # lint-amnesty, pylint: disable=http-response-with-content-type-json
+ return HttpResponse(RegistrationFormFactory().get_registration_form(request).to_json(), # pylint: disable=http-response-with-content-type-json
content_type="application/json")
@method_decorator(csrf_exempt)
@@ -727,7 +727,6 @@ def _create_response(self, request, response_dict, status_code, redirect_url=Non
return JsonResponse(response_dict, status=status_code)
-# pylint: disable=line-too-long
class RegistrationValidationView(APIView):
"""
**Use Cases**
@@ -812,7 +811,7 @@ class RegistrationValidationView(APIView):
decision with the username is made if it exists in the input.
"country":
A handler to check whether the validity of country fields.
- """
+ """ # noqa: E501
# This end-point is available to anonymous users, so no authentication is needed.
authentication_classes = []
diff --git a/openedx/core/djangoapps/user_authn/views/registration_form.py b/openedx/core/djangoapps/user_authn/views/registration_form.py
index 7c84b224f518..7d448756f4a9 100644
--- a/openedx/core/djangoapps/user_authn/views/registration_form.py
+++ b/openedx/core/djangoapps/user_authn/views/registration_form.py
@@ -535,7 +535,7 @@ def get_registration_form(self, request):
FormDescription.FIELD_TYPE_MAP.get(field.__class__))
if not field_type:
raise ImproperlyConfigured(
- "Field type '{}' not recognized for registration extension field '{}'.".format( # noqa: UP032 # pylint: disable=line-too-long
+ "Field type '{}' not recognized for registration extension field '{}'.".format( # noqa: UP032
field_type,
field_name
)
diff --git a/openedx/core/djangoapps/user_authn/views/tests/test_login.py b/openedx/core/djangoapps/user_authn/views/tests/test_login.py
index b87b51dd25d2..9f187ce34b33 100644
--- a/openedx/core/djangoapps/user_authn/views/tests/test_login.py
+++ b/openedx/core/djangoapps/user_authn/views/tests/test_login.py
@@ -1080,7 +1080,7 @@ def test_login_form(self):
assert form_desc['submit_url'] == reverse('user_api_login_session', kwargs={'api_version': 'v1'})
assert form_desc['fields'] == [{'name': 'email', 'defaultValue': '', 'type': 'email', 'exposed': True,
'required': True, 'label': 'Email', 'placeholder': '',
- 'instructions': 'The email address you used to register with {platform_name}' # noqa: UP032 # pylint: disable=line-too-long
+ 'instructions': 'The email address you used to register with {platform_name}' # noqa: UP032
.format(platform_name=settings.PLATFORM_NAME),
'restrictions': {'min_length': EMAIL_MIN_LENGTH,
'max_length': EMAIL_MAX_LENGTH},
diff --git a/openedx/core/djangoapps/user_authn/views/tests/test_password.py b/openedx/core/djangoapps/user_authn/views/tests/test_password.py
index 958ec3d941e9..037e3bd85fd5 100644
--- a/openedx/core/djangoapps/user_authn/views/tests/test_password.py
+++ b/openedx/core/djangoapps/user_authn/views/tests/test_password.py
@@ -234,7 +234,7 @@ def test_password_reset_failure_email(self):
html_body = sent_message.alternatives[0][0]
for email_body in [text_body, html_body]:
- msg = 'However, there is currently no user account associated with your email address: {email}'.format( # noqa: UP032 # pylint: disable=line-too-long
+ msg = 'However, there is currently no user account associated with your email address: {email}'.format( # noqa: UP032
email=bad_email
)
diff --git a/openedx/core/djangoapps/user_authn/views/tests/test_reset_password.py b/openedx/core/djangoapps/user_authn/views/tests/test_reset_password.py
index ad4076ce4bd7..a1db0f7a7569 100644
--- a/openedx/core/djangoapps/user_authn/views/tests/test_reset_password.py
+++ b/openedx/core/djangoapps/user_authn/views/tests/test_reset_password.py
@@ -653,7 +653,7 @@ def test_reset_password_with_other_user_link(self):
reset_request = self.request_factory.get(self.password_reset_confirm_url)
reset_request.user = UserFactory.create()
- self.assertRaises(Http404, PasswordResetConfirmWrapper.as_view(), reset_request, uidb36=self.uidb36, # noqa: PT027 # pylint: disable=line-too-long
+ self.assertRaises(Http404, PasswordResetConfirmWrapper.as_view(), reset_request, uidb36=self.uidb36, # noqa: PT027
token=self.token)
@override_settings(FEATURES={'ENABLE_MAX_FAILED_LOGIN_ATTEMPTS': True}, MAX_FAILED_LOGIN_ATTEMPTS_ALLOWED=1)
diff --git a/openedx/core/djangoapps/util/management/commands/reset_db.py b/openedx/core/djangoapps/util/management/commands/reset_db.py
index d7b8974db6e3..689f8dc45466 100644
--- a/openedx/core/djangoapps/util/management/commands/reset_db.py
+++ b/openedx/core/djangoapps/util/management/commands/reset_db.py
@@ -93,9 +93,9 @@ def handle(self, *args, **options): # lint-amnesty, pylint: disable=too-many-st
elif engine in ('postgresql', 'postgresql_psycopg2', 'postgis'):
if engine == 'postgresql' and django.VERSION < (1, 9):
- import psycopg as Database # NOQA # lint-amnesty, pylint: disable=import-error
+ import psycopg as Database # lint-amnesty, pylint: disable=import-error
elif engine in ('postgresql', 'postgresql_psycopg2', 'postgis'):
- import psycopg2 as Database # NOQA # lint-amnesty, pylint: disable=import-error
+ import psycopg2 as Database # lint-amnesty, pylint: disable=import-error
conn_params = {'database': 'template1'}
if user:
diff --git a/openedx/core/djangoapps/util/row_delete.py b/openedx/core/djangoapps/util/row_delete.py
index 8c1ff8b975ac..562d3b499a63 100644
--- a/openedx/core/djangoapps/util/row_delete.py
+++ b/openedx/core/djangoapps/util/row_delete.py
@@ -62,7 +62,7 @@ def delete_rows(model_mgr,
# The "as id" below fools Django raw query into thinking the primary key is being queried.
# It's necessary because Django will throw an exception if the raw SQL does not query the primary key.
min_max_ids = model_mgr.raw(
- f'SELECT MIN({primary_id_name}) as id, MAX({primary_id_name}) as max_id FROM {table_name}' # lint-amnesty, pylint: disable=duplicate-string-formatting-argument
+ f'SELECT MIN({primary_id_name}) as id, MAX({primary_id_name}) as max_id FROM {table_name}' # pylint: disable=duplicate-string-formatting-argument
)[0]
min_id = min_max_ids.id
max_id = min_max_ids.max_id
@@ -81,7 +81,7 @@ def delete_rows(model_mgr,
log.info("Deleting around %s rows between ids %s and %s...", deletions_now, lower_id, upper_id)
with transaction.atomic():
# xss-lint: disable=python-wrap-html
- delete_sql = 'DELETE FROM {} WHERE {} >= {} AND {} < {}'.format( # lint-amnesty, pylint: disable=duplicate-string-formatting-argument # noqa: UP032
+ delete_sql = 'DELETE FROM {} WHERE {} >= {} AND {} < {}'.format( # pylint: disable=duplicate-string-formatting-argument # noqa: UP032
table_name, primary_id_name, lower_id, primary_id_name, upper_id
)
log.info(delete_sql)
@@ -113,7 +113,7 @@ def add_arguments(self, parser):
'--chunk_size',
default=self.DEFAULT_CHUNK_SIZE,
type=int,
- help='Maximum number of rows to delete in each DB transaction. Choose this value carefully to avoid DB outages!' # lint-amnesty, pylint: disable=line-too-long
+ help='Maximum number of rows to delete in each DB transaction. Choose this value carefully to avoid DB outages!' # noqa: E501
)
parser.add_argument(
'--sleep_between',
diff --git a/openedx/core/djangoapps/util/user_messages.py b/openedx/core/djangoapps/util/user_messages.py
index 213814944880..3565c2d21fcd 100644
--- a/openedx/core/djangoapps/util/user_messages.py
+++ b/openedx/core/djangoapps/util/user_messages.py
@@ -127,28 +127,28 @@ def register_user_message(cls, request, message_type, body_html, once_only=False
messages.add_message(request, message_type.value, Text(message), extra_tags=cls.get_namespace())
@classmethod
- def register_info_message(self, request, message, **kwargs): # lint-amnesty, pylint: disable=bad-classmethod-argument
+ def register_info_message(self, request, message, **kwargs): # pylint: disable=bad-classmethod-argument
"""
Registers an information message to be shown to the user.
"""
self.register_user_message(request, UserMessageType.INFO, message, **kwargs)
@classmethod
- def register_success_message(self, request, message, **kwargs): # lint-amnesty, pylint: disable=bad-classmethod-argument
+ def register_success_message(self, request, message, **kwargs): # pylint: disable=bad-classmethod-argument
"""
Registers a success message to be shown to the user.
"""
self.register_user_message(request, UserMessageType.SUCCESS, message, **kwargs)
@classmethod
- def register_warning_message(self, request, message, **kwargs): # lint-amnesty, pylint: disable=bad-classmethod-argument
+ def register_warning_message(self, request, message, **kwargs): # pylint: disable=bad-classmethod-argument
"""
Registers a warning message to be shown to the user.
"""
self.register_user_message(request, UserMessageType.WARNING, message, **kwargs)
@classmethod
- def register_error_message(self, request, message, **kwargs): # lint-amnesty, pylint: disable=bad-classmethod-argument
+ def register_error_message(self, request, message, **kwargs): # pylint: disable=bad-classmethod-argument
"""
Registers an error message to be shown to the user.
"""
@@ -166,7 +166,7 @@ def _get_message_type_for_level(level):
"""
Returns the user message type associated with a level.
"""
- for __, type in UserMessageType.__members__.items(): # lint-amnesty, pylint: disable=redefined-builtin, no-member
+ for __, type in UserMessageType.__members__.items(): # pylint: disable=redefined-builtin, no-member
if type.value is level:
return type
raise Exception(f'Unable to find UserMessageType for level {level}')
diff --git a/openedx/core/djangoapps/video_config/transcripts_utils.py b/openedx/core/djangoapps/video_config/transcripts_utils.py
index 6e6f0fde7b8c..3f8e3438b8d2 100644
--- a/openedx/core/djangoapps/video_config/transcripts_utils.py
+++ b/openedx/core/djangoapps/video_config/transcripts_utils.py
@@ -196,7 +196,7 @@ def get_transcript_link_from_youtube(youtube_id):
return None
-def get_transcript_links_from_youtube(youtube_id, settings, i18n, youtube_transcript_name=''): # lint-amnesty, pylint: disable=redefined-outer-name
+def get_transcript_links_from_youtube(youtube_id, settings, i18n, youtube_transcript_name=''): # pylint: disable=redefined-outer-name
"""
Gets transcripts from youtube for youtube_id.
@@ -491,7 +491,7 @@ def generate_sjson_for_all_speeds(block, user_filename, result_subs_dict, lang):
try:
srt_transcripts = contentstore().find(Transcript.asset_location(block.location, user_filename))
except NotFoundError as ex:
- raise TranscriptException(_("{exception_message}: Can't find uploaded transcripts: {user_filename}").format( # noqa: B904 # pylint: disable=raise-missing-from,line-too-long
+ raise TranscriptException(_("{exception_message}: Can't find uploaded transcripts: {user_filename}").format( # noqa: B904 # pylint: disable=raise-missing-from
exception_message=str(ex),
user_filename=user_filename
))
diff --git a/openedx/core/djangolib/js_utils.py b/openedx/core/djangolib/js_utils.py
index 115419d1c67b..1148608823c4 100644
--- a/openedx/core/djangolib/js_utils.py
+++ b/openedx/core/djangolib/js_utils.py
@@ -69,7 +69,7 @@ def dump_js_escaped_json(obj, cls=EdxJSONEncoder):
(string) Escaped encoded JSON.
"""
- obj = list(obj) if isinstance(obj, type({}.values())) else obj # lint-amnesty, pylint: disable=isinstance-second-argument-not-valid-type, line-too-long
+ obj = list(obj) if isinstance(obj, type({}.values())) else obj # pylint: disable=isinstance-second-argument-not-valid-type
json_string = json.dumps(obj, ensure_ascii=True, cls=cls)
json_string = _escape_json_for_js(json_string)
return json_string
diff --git a/openedx/core/djangolib/testing/utils.py b/openedx/core/djangolib/testing/utils.py
index 60b012607380..12076eb5edc3 100644
--- a/openedx/core/djangolib/testing/utils.py
+++ b/openedx/core/djangolib/testing/utils.py
@@ -214,7 +214,7 @@ class FilteredQueryCountMixin:
assertNumQueries with one that accepts a ignorelist of tables to filter out
of the count.
"""
- def assertNumQueries(self, num, func=None, table_ignorelist=None, *args, **kwargs): # lint-amnesty, pylint: disable=keyword-arg-before-vararg
+ def assertNumQueries(self, num, func=None, table_ignorelist=None, *args, **kwargs): # pylint: disable=keyword-arg-before-vararg
"""
Used to replace Django's assertNumQueries with the same capability, with
the addition of the following argument:
diff --git a/openedx/core/lib/api/serializers.py b/openedx/core/lib/api/serializers.py
index dbcf4b304741..b68841669147 100644
--- a/openedx/core/lib/api/serializers.py
+++ b/openedx/core/lib/api/serializers.py
@@ -13,7 +13,7 @@ class CollapsedReferenceSerializer(serializers.HyperlinkedModelSerializer):
"""Serializes arbitrary models in a collapsed format, with just an id and url."""
url = serializers.HyperlinkedIdentityField(view_name='')
- def __init__(self, model_class, view_name, id_source='id', lookup_field=None, *args, **kwargs): # lint-amnesty, pylint: disable=keyword-arg-before-vararg
+ def __init__(self, model_class, view_name, id_source='id', lookup_field=None, *args, **kwargs): # pylint: disable=keyword-arg-before-vararg
"""Configures the serializer.
Args:
diff --git a/openedx/core/lib/api/tests/test_authentication.py b/openedx/core/lib/api/tests/test_authentication.py
index 8a53f3b2f92a..6718c4a01964 100644
--- a/openedx/core/lib/api/tests/test_authentication.py
+++ b/openedx/core/lib/api/tests/test_authentication.py
@@ -214,7 +214,7 @@ def test_response_for_post_request_with_bad_auth_token(self, token_error):
self.check_error_codes(response, status_code=status.HTTP_401_UNAUTHORIZED, error_code=token_error.error_code)
-class BearerAuthenticationTests(OAuth2AllowInActiveUsersTests): # lint-amnesty, pylint: disable=missing-class-docstring, test-inherits-tests
+class BearerAuthenticationTests(OAuth2AllowInActiveUsersTests): # pylint: disable=missing-class-docstring, test-inherits-tests
OAUTH2_BASE_TESTING_URL = '/oauth2-test/'
diff --git a/openedx/core/lib/api/view_utils.py b/openedx/core/lib/api/view_utils.py
index ac8aac610ab8..5fa63ac3afa0 100644
--- a/openedx/core/lib/api/view_utils.py
+++ b/openedx/core/lib/api/view_utils.py
@@ -156,7 +156,7 @@ def add_serializer_errors(serializer, data, field_errors):
for key, error in errors.items():
error = clean_errors(error)
if key == 'bio':
- user_message = _(f"The about me field must be at most {BIO_MAX_LENGTH} characters long.") # lint-amnesty, pylint: disable=translation-of-non-string
+ user_message = _(f"The about me field must be at most {BIO_MAX_LENGTH} characters long.") # pylint: disable=translation-of-non-string
else:
user_message = _("This value is invalid.")
@@ -291,7 +291,7 @@ def __getitem__(self, index):
self._data.append(next(self.iterable))
except StopIteration:
self._exhausted = True
- raise IndexError("Underlying sequence exhausted") # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904
+ raise IndexError("Underlying sequence exhausted") # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904, E501
return self._data[index]
elif isinstance(index, slice):
diff --git a/openedx/core/lib/command_utils.py b/openedx/core/lib/command_utils.py
index c5cae3d2b125..2cd4aa4c1d96 100644
--- a/openedx/core/lib/command_utils.py
+++ b/openedx/core/lib/command_utils.py
@@ -46,4 +46,4 @@ def parse_course_keys(course_key_strings):
try:
return [CourseKey.from_string(course_key_string) for course_key_string in course_key_strings]
except InvalidKeyError as error:
- raise CommandError(f'Invalid key specified: {str(error)}') # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904
+ raise CommandError(f'Invalid key specified: {str(error)}') # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904, E501
diff --git a/openedx/core/lib/edx_api_utils.py b/openedx/core/lib/edx_api_utils.py
index 0ec4eed9c98c..a7263fba6049 100644
--- a/openedx/core/lib/edx_api_utils.py
+++ b/openedx/core/lib/edx_api_utils.py
@@ -110,7 +110,7 @@ def get_api_data(
else:
results = response
- except: # pylint: disable=bare-except
+ except: # noqa: E722
log.exception("Failed to retrieve data from the %s API.", api_config.API_NAME)
if raise_on_error:
raise
diff --git a/openedx/core/lib/graph_traversals.py b/openedx/core/lib/graph_traversals.py
index 027b050a4f03..263c37717598 100644
--- a/openedx/core/lib/graph_traversals.py
+++ b/openedx/core/lib/graph_traversals.py
@@ -161,7 +161,7 @@ def traverse_topologically(
)
-def traverse_pre_order(start_node, get_children, filter_func=None): # lint-amnesty, pylint: disable=redefined-outer-name
+def traverse_pre_order(start_node, get_children, filter_func=None): # pylint: disable=redefined-outer-name
"""
Generator for yielding nodes of a tree (or directed acyclic graph)
in a pre-order sort.
@@ -178,7 +178,7 @@ def traverse_pre_order(start_node, get_children, filter_func=None): # lint-amne
)
-def traverse_post_order(start_node, get_children, filter_func=None): # lint-amnesty, pylint: disable=redefined-outer-name
+def traverse_post_order(start_node, get_children, filter_func=None): # pylint: disable=redefined-outer-name
"""
Generator for yielding nodes of a tree (or directed acyclic graph)
in a post-order sort.
diff --git a/openedx/core/lib/request_utils.py b/openedx/core/lib/request_utils.py
index 36d2b12ec3d5..0529c8c234e4 100644
--- a/openedx/core/lib/request_utils.py
+++ b/openedx/core/lib/request_utils.py
@@ -144,12 +144,12 @@ def process_exception(self, request, exception):
# defined here, the middleware will add the custom attributes ``error_ignored_class`` and ``error_ignored_message``
#. to help diagnose issues with ignored errors, since this data is not otherwise available.
# For an example of ignoring errors in New Relic, see:
-# https://docs.newrelic.com/docs/agents/manage-apm-agents/agent-data/manage-errors-apm-collect-ignore-or-mark-expected/#ignore pylint: disable=line-too-long,useless-suppression
+# https://docs.newrelic.com/docs/agents/manage-apm-agents/agent-data/manage-errors-apm-collect-ignore-or-mark-expected/#ignore pylint: disable=useless-suppression # noqa: E501
# To query for ignored errors, you would use ``error_ignored_class IS NOT NULL``.
-# .. setting_warning: At this time, an error that matches won't actually be ignored. These settings should be set to match
-# the ignored error configuration found elsewhere, like in New Relic. When monitoring, no errors should ever have the attribute
+# .. setting_warning: At this time, an error that matches won't actually be ignored. These settings should be set to match # noqa: E501
+# the ignored error configuration found elsewhere, like in New Relic. When monitoring, no errors should ever have the attribute # noqa: E501
# ``error_ignored_class``. Only Transactions should have this custom attribute. If found for an error, it means we
-# are stating an error should be ignored when it is not actually configured as such, or the (New Relic) configuration is not
+# are stating an error should be ignored when it is not actually configured as such, or the (New Relic) configuration is not # noqa: E501
# working.
# .. toggle_name: IGNORED_ERRORS[N]['LOG_ERROR']
@@ -303,7 +303,7 @@ def _log_and_monitor_ignored_errors(request, exception, caller):
set_custom_attribute('checked_error_ignored_from', 'multiple')
return
- # We have confirmed using monitoring that it is very rare that middleware and drf handle different uncaught exceptions.
+ # We have confirmed using monitoring that it is very rare that middleware and drf handle different uncaught exceptions. # noqa: E501
# We will leave this attribute in place, but it is not worth investing in a workaround.
set_custom_attribute('unexpected_multiple_exceptions', cached_module_and_class)
log.warning(
diff --git a/openedx/core/lib/safe_lxml/etree.py b/openedx/core/lib/safe_lxml/etree.py
index 8570a48cb649..267108bccb86 100644
--- a/openedx/core/lib/safe_lxml/etree.py
+++ b/openedx/core/lib/safe_lxml/etree.py
@@ -29,4 +29,4 @@ class XMLParser(_XMLParser): # pylint: disable=function-redefined
def __init__(self, *args, **kwargs):
if "resolve_entities" not in kwargs:
kwargs["resolve_entities"] = False
- super(XMLParser, self).__init__(*args, **kwargs) # lint-amnesty, pylint: disable=super-with-arguments # noqa: UP008
+ super(XMLParser, self).__init__(*args, **kwargs) # pylint: disable=super-with-arguments # noqa: UP008
diff --git a/openedx/core/lib/teams_config.py b/openedx/core/lib/teams_config.py
index 1a9399b70419..d43451b9b21a 100644
--- a/openedx/core/lib/teams_config.py
+++ b/openedx/core/lib/teams_config.py
@@ -178,7 +178,7 @@ def calc_max_team_size(self, teamset_id):
try:
teamset = self.teamsets_by_id[teamset_id]
except KeyError:
- raise ValueError(f"Team-set {teamset_id!r} does not exist.") # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904
+ raise ValueError(f"Team-set {teamset_id!r} does not exist.") # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904, E501
if teamset.teamset_type != TeamsetType.open:
return MANAGED_TEAM_MAX_TEAM_SIZE
if teamset.max_team_size:
diff --git a/openedx/core/lib/tests/assertions/events.py b/openedx/core/lib/tests/assertions/events.py
index a62f64db99f7..e2a2b33a50d5 100644
--- a/openedx/core/lib/tests/assertions/events.py
+++ b/openedx/core/lib/tests/assertions/events.py
@@ -184,7 +184,7 @@ def block_indent(text, spaces=4):
If `text` is not a string it is formatted using pprint.pformat.
"""
- return '\n'.join([(' ' * spaces) + l for l in pprint.pformat(text).splitlines()])
+ return '\n'.join([(' ' * spaces) + line for line in pprint.pformat(text).splitlines()])
def parse_event_payload(event):
diff --git a/openedx/core/lib/tests/test_cache_utils.py b/openedx/core/lib/tests/test_cache_utils.py
index 064ac6e33c4a..754b7d0a4e61 100644
--- a/openedx/core/lib/tests/test_cache_utils.py
+++ b/openedx/core/lib/tests/test_cache_utils.py
@@ -242,7 +242,7 @@ def mock_wrapper(*args, **kwargs):
return to_be_wrapped(*args, **kwargs)
request_cache_getter = lambda args, kwargs: RequestCache('test')
- wrapped = request_cached(request_cache_getter=request_cache_getter)(mock_wrapper) # lint-amnesty, pylint: disable=no-value-for-parameter
+ wrapped = request_cached(request_cache_getter=request_cache_getter)(mock_wrapper) # pylint: disable=no-value-for-parameter
# This will be a miss, and make an underlying call.
result = wrapped(1)
@@ -277,7 +277,7 @@ def mock_wrapper(*args, **kwargs):
return to_be_wrapped(*args, **kwargs)
arg_map_function = lambda arg: str(arg == 1)
- wrapped = request_cached(arg_map_function=arg_map_function)(mock_wrapper) # lint-amnesty, pylint: disable=no-value-for-parameter
+ wrapped = request_cached(arg_map_function=arg_map_function)(mock_wrapper) # pylint: disable=no-value-for-parameter
# This will be a miss, and make an underlying call.
result = wrapped(1)
diff --git a/openedx/core/lib/xblock_serializer/test_api.py b/openedx/core/lib/xblock_serializer/test_api.py
index d8703661693d..c5406c751245 100644
--- a/openedx/core/lib/xblock_serializer/test_api.py
+++ b/openedx/core/lib/xblock_serializer/test_api.py
@@ -67,7 +67,7 @@
youtube_id_1_0="1bK-WdDi6Qw"
/>
-"""
+""" # noqa: E501
@skip_unless_cms
diff --git a/openedx/core/process_warnings.py b/openedx/core/process_warnings.py
index 4da24960ac0d..33f1e6ce7865 100644
--- a/openedx/core/process_warnings.py
+++ b/openedx/core/process_warnings.py
@@ -12,7 +12,7 @@
from collections import Counter
from xml.sax.saxutils import escape
-from write_to_html import HtmlOutlineWriter # noqa pylint: disable=import-error,useless-suppression
+from write_to_html import HtmlOutlineWriter
columns = [
"message",
@@ -35,11 +35,11 @@ def separate_warnings_by_location(warnings_data):
# first create regex for each n file location
warnings_locations = {
- r".*/python\d\.\d/site-packages/.*\.py": "python", # noqa pylint: disable=W1401
- r".*/edx-platform/lms/.*\.py": "lms", # noqa pylint: disable=W1401
- r".*/edx-platform/openedx/.*\.py": "openedx", # noqa pylint: disable=W1401
- r".*/edx-platform/cms/.*\.py": "cms", # noqa pylint: disable=W1401
- r".*/edx-platform/common/.*\.py": "common", # noqa pylint: disable=W1401
+ r".*/python\d\.\d/site-packages/.*\.py": "python",
+ r".*/edx-platform/lms/.*\.py": "lms",
+ r".*/edx-platform/openedx/.*\.py": "openedx",
+ r".*/edx-platform/cms/.*\.py": "cms",
+ r".*/edx-platform/common/.*\.py": "common",
}
# separate into locations flow:
@@ -91,7 +91,7 @@ def read_warning_data(dir_path):
# TODO(jinder): currently this is hard-coded in, maybe create a constants file with info
# THINK(jinder): but creating file for one constant seems overkill
warnings_file_name_regex = (
- r"pytest_warnings_?[\w.-]*\.json" # noqa pylint: disable=W1401
+ r"pytest_warnings_?[\w.-]*\.json"
)
# iterate through files_in_dir and see if they match our know file name pattern
@@ -167,7 +167,7 @@ def process_warnings_json(dir_path):
warnings_object[columns_index_dict["deprecated"]] = bool(
"deprecated" in warnings_object[columns_index_dict["message"]]
)
- warnings_object[columns_index_dict["message"]] = canonical_message(warnings_object[columns_index_dict["message"]])
+ warnings_object[columns_index_dict["message"]] = canonical_message(warnings_object[columns_index_dict["message"]]) # noqa: E501
warnings_data = separate_warnings_by_location(warnings_data)
compressed_warnings_data = compress_similar_warnings(warnings_data)
return compressed_warnings_data
diff --git a/openedx/core/pytest_hooks.py b/openedx/core/pytest_hooks.py
index c99f7694e10d..cd1bfee03c12 100644
--- a/openedx/core/pytest_hooks.py
+++ b/openedx/core/pytest_hooks.py
@@ -56,7 +56,7 @@ def pytest_sessionfinish(session):
):
num += 1
- report = session.config._json_report.report # noqa pylint: disable=protected-access
+ report = session.config._json_report.report
with open(create_file_name(dir_path, file_name_postfix, num), "w") as outfile:
json.dump(report, outfile)
diff --git a/openedx/core/toggles.py b/openedx/core/toggles.py
index a5491566448f..3565da5694a3 100644
--- a/openedx/core/toggles.py
+++ b/openedx/core/toggles.py
@@ -22,7 +22,7 @@
# .. toggle_implementation: CourseWaffleFlag
# .. toggle_default: False
# .. toggle_description: This toggle will enable the new openedx-authz authorization engine for course authoring.
-# .. toggle_warning: Enabling this toggle will trigger a data migration to move role assignations between the legacy and the openedx-authz system.
+# .. toggle_warning: Enabling this toggle will trigger a data migration to move role assignations between the legacy and the openedx-authz system. # noqa: E501
# .. toggle_use_cases: temporary
# .. toggle_creation_date: 2026-02-05
# .. toggle_target_removal_date: 2027-06-09
diff --git a/openedx/envs/common.py b/openedx/envs/common.py
index df18a69e9ef4..6a63b0085aeb 100644
--- a/openedx/envs/common.py
+++ b/openedx/envs/common.py
@@ -1155,7 +1155,7 @@ def add_optional_apps(optional_apps, installed_apps):
# .. toggle_description: Set to True to enable course certificates on your instance of Open edX.
# .. toggle_warning: You must enable this feature flag in both Studio and the LMS and complete the configuration tasks
# described here:
-# https://docs.openedx.org/en/latest/site_ops/install_configure_run_guide/configuration/enable_certificates.html pylint: disable=line-too-long,useless-suppression
+# https://docs.openedx.org/en/latest/site_ops/install_configure_run_guide/configuration/enable_certificates.html pylint: disable=useless-suppression # noqa: E501
# .. toggle_use_cases: open_edx
# .. toggle_creation_date: 2015-03-13
# .. toggle_target_removal_date: None
@@ -1402,7 +1402,7 @@ def add_optional_apps(optional_apps, installed_apps):
# a configurable threshold (default 6), then the account will be locked for a configurable amount of seconds
# (30 minutes) which will prevent additional login attempts until this time period has passed. If a user
# successfully logs in, all the counter which tracks the number of failed attempts will be reset back to 0. If
-# set to False then account locking will be disabled for failed login attempts. (Note: set to False by default in the CMS).
+# set to False then account locking will be disabled for failed login attempts. (Note: set to False by default in the CMS). # noqa: E501
# .. toggle_use_cases: open_edx
# .. toggle_creation_date: 2014-01-30
# .. toggle_tickets: https://github.com/openedx/edx-platform/pull/2331
@@ -2062,7 +2062,7 @@ def add_optional_apps(optional_apps, installed_apps):
# .. toggle_name: USE_EXTRACTED_WORD_CLOUD_BLOCK
# .. toggle_default: True
# .. toggle_implementation: DjangoSetting
-# .. toggle_description: Enables the use of the extracted Word Cloud XBlock, which has been shifted to the 'openedx/xblocks-contrib' repo.
+# .. toggle_description: Enables the use of the extracted Word Cloud XBlock, which has been shifted to the 'openedx/xblocks-contrib' repo. # noqa: E501
# .. toggle_use_cases: temporary
# .. toggle_creation_date: 2024-11-10
# .. toggle_target_removal_date: 2026-04-10
@@ -2071,7 +2071,7 @@ def add_optional_apps(optional_apps, installed_apps):
# .. toggle_name: USE_EXTRACTED_ANNOTATABLE_BLOCK
# .. toggle_default: True
# .. toggle_implementation: DjangoSetting
-# .. toggle_description: Enables the use of the extracted annotatable XBlock, which has been shifted to the 'openedx/xblocks-contrib' repo.
+# .. toggle_description: Enables the use of the extracted annotatable XBlock, which has been shifted to the 'openedx/xblocks-contrib' repo. # noqa: E501
# .. toggle_use_cases: temporary
# .. toggle_creation_date: 2024-11-10
# .. toggle_target_removal_date: 2026-04-10
@@ -2080,7 +2080,7 @@ def add_optional_apps(optional_apps, installed_apps):
# .. toggle_name: USE_EXTRACTED_POLL_QUESTION_BLOCK
# .. toggle_default: True
# .. toggle_implementation: DjangoSetting
-# .. toggle_description: Enables the use of the extracted poll question XBlock, which has been shifted to the 'openedx/xblocks-contrib' repo.
+# .. toggle_description: Enables the use of the extracted poll question XBlock, which has been shifted to the 'openedx/xblocks-contrib' repo. # noqa: E501
# .. toggle_use_cases: temporary
# .. toggle_creation_date: 2024-11-10
# .. toggle_target_removal_date: 2026-04-10
@@ -2089,7 +2089,7 @@ def add_optional_apps(optional_apps, installed_apps):
# .. toggle_name: USE_EXTRACTED_LTI_BLOCK
# .. toggle_default: True
# .. toggle_implementation: DjangoSetting
-# .. toggle_description: Enables the use of the extracted LTI XBlock, which has been shifted to the 'openedx/xblocks-contrib' repo.
+# .. toggle_description: Enables the use of the extracted LTI XBlock, which has been shifted to the 'openedx/xblocks-contrib' repo. # noqa: E501
# .. toggle_use_cases: temporary
# .. toggle_creation_date: 2024-11-10
# .. toggle_target_removal_date: 2026-04-10
@@ -2098,7 +2098,7 @@ def add_optional_apps(optional_apps, installed_apps):
# .. toggle_name: USE_EXTRACTED_HTML_BLOCK
# .. toggle_default: True
# .. toggle_implementation: DjangoSetting
-# .. toggle_description: Enables the use of the extracted HTML XBlock, which has been shifted to the 'openedx/xblocks-contrib' repo.
+# .. toggle_description: Enables the use of the extracted HTML XBlock, which has been shifted to the 'openedx/xblocks-contrib' repo. # noqa: E501
# .. toggle_use_cases: temporary
# .. toggle_creation_date: 2024-11-10
# .. toggle_target_removal_date: 2026-04-10
@@ -2107,9 +2107,9 @@ def add_optional_apps(optional_apps, installed_apps):
# .. toggle_name: USE_EXTRACTED_DISCUSSION_BLOCK
# .. toggle_default: False
# .. toggle_implementation: DjangoSetting
-# .. toggle_description: Enables the use of the extracted Discussion XBlock, which has been shifted to the 'openedx/xblocks-contrib' repo.
+# .. toggle_description: Enables the use of the extracted Discussion XBlock, which has been shifted to the 'openedx/xblocks-contrib' repo. # noqa: E501
# .. toggle_use_cases: temporary
-# .. toggle_warning: Not production-ready until relevant subtask https://github.com/openedx/edx-platform/issues/34827 is done.
+# .. toggle_warning: Not production-ready until relevant subtask https://github.com/openedx/edx-platform/issues/34827 is done. # noqa: E501
# .. toggle_creation_date: 2024-11-10
# .. toggle_target_removal_date: 2026-04-10
USE_EXTRACTED_DISCUSSION_BLOCK = True
@@ -2117,9 +2117,9 @@ def add_optional_apps(optional_apps, installed_apps):
# .. toggle_name: USE_EXTRACTED_PROBLEM_BLOCK
# .. toggle_default: False
# .. toggle_implementation: DjangoSetting
-# .. toggle_description: Enables the use of the extracted Problem XBlock, which has been shifted to the 'openedx/xblocks-contrib' repo.
+# .. toggle_description: Enables the use of the extracted Problem XBlock, which has been shifted to the 'openedx/xblocks-contrib' repo. # noqa: E501
# .. toggle_use_cases: temporary
-# .. toggle_warning: Not production-ready until relevant subtask https://github.com/openedx/edx-platform/issues/34827 is done.
+# .. toggle_warning: Not production-ready until relevant subtask https://github.com/openedx/edx-platform/issues/34827 is done. # noqa: E501
# .. toggle_creation_date: 2024-11-10
# .. toggle_target_removal_date: 2026-04-10
USE_EXTRACTED_PROBLEM_BLOCK = True
@@ -2127,7 +2127,7 @@ def add_optional_apps(optional_apps, installed_apps):
# .. toggle_name: USE_EXTRACTED_VIDEO_BLOCK
# .. toggle_default: True
# .. toggle_implementation: DjangoSetting
-# .. toggle_description: Enables the use of the extracted Video XBlock, which has been shifted to the 'openedx/xblocks-contrib' repo.
+# .. toggle_description: Enables the use of the extracted Video XBlock, which has been shifted to the 'openedx/xblocks-contrib' repo. # noqa: E501
# .. toggle_use_cases: temporary
# .. toggle_creation_date: 2024-11-10
# .. toggle_target_removal_date: 2026-04-10
diff --git a/openedx/envs/test.py b/openedx/envs/test.py
index 8c0fafe6c372..d758d692cd7b 100644
--- a/openedx/envs/test.py
+++ b/openedx/envs/test.py
@@ -1,4 +1,4 @@
-# ruff: noqa: I001 - settings file: star-import order is semantically significant
+
"""
Common test related Django settings for Open edX services.
@@ -143,7 +143,7 @@ def make_staticfile_dirs(settings):
"dq": "WQ44_KTIbIej9qnYUPMA1DoaAF8ImVDIdiOp9c79dC7FvCpN3w-lnuugrYDM1j9Tk5bRrY7-JuE6OaKQgOtajoS1BIxjYHj5xAVPD15CVevOihqeq5Zx0ZAAYmmCKRrfUe0iLx2QnIcoKH1-Azs23OXeeo6nysznZjvv9NVJv60",
"qi": "KSWGH607H1kNG2okjYdmVdNgLxTUB-Wye9a9FNFE49UmQIOJeZYXtDzcjk8IiK3g-EU3CqBeDKVUgHvHFu4_Wj3IrIhKYizS4BeFmOcPDvylDQCmJcC9tXLQgHkxM_MEJ7iLn9FOLRshh7GPgZphXxMhezM26Cz-8r3_mACHu84"
}
- """,
+ """, # noqa: E501
}
# Celery settings
diff --git a/openedx/features/calendar_sync/signals.py b/openedx/features/calendar_sync/signals.py
index 7bd13d13640e..211f2cf4bc64 100644
--- a/openedx/features/calendar_sync/signals.py
+++ b/openedx/features/calendar_sync/signals.py
@@ -13,7 +13,7 @@
@receiver(post_save, sender=UserCalendarSyncConfig)
-def handle_calendar_sync_email(sender, instance, created, **kwargs): # lint-amnesty, pylint: disable=missing-function-docstring, unused-argument
+def handle_calendar_sync_email(sender, instance, created, **kwargs): # pylint: disable=missing-function-docstring, unused-argument
if (
CALENDAR_SYNC_FLAG.is_enabled(instance.course_key) and
RELATIVE_DATES_FLAG.is_enabled(instance.course_key) and
diff --git a/openedx/features/calendar_sync/utils.py b/openedx/features/calendar_sync/utils.py
index 7d26449d6046..2b343d70c535 100644
--- a/openedx/features/calendar_sync/utils.py
+++ b/openedx/features/calendar_sync/utils.py
@@ -59,7 +59,7 @@ def prepare_attachments(attachment_data, file_ext=''):
return attachments
-def send_email_with_attachment(to_emails, attachment_data, course_name, is_initial): # lint-amnesty, pylint: disable=missing-function-docstring
+def send_email_with_attachment(to_emails, attachment_data, course_name, is_initial): # pylint: disable=missing-function-docstring
# connect to SES
client = boto3.client('ses', region_name=settings.AWS_SES_REGION_NAME)
diff --git a/openedx/features/content_type_gating/models.py b/openedx/features/content_type_gating/models.py
index 8e26d0640f50..6bf67d38041e 100644
--- a/openedx/features/content_type_gating/models.py
+++ b/openedx/features/content_type_gating/models.py
@@ -101,7 +101,7 @@ def enabled_as_of_datetime(self, target_datetime):
return bool(self.enabled and self.enabled_as_of <= target_datetime)
def __str__(self):
- return "ContentTypeGatingConfig(enabled={!r}, enabled_as_of={!r}, studio_override_enabled={!r})".format( # noqa: UP032 # pylint: disable=line-too-long
+ return "ContentTypeGatingConfig(enabled={!r}, enabled_as_of={!r}, studio_override_enabled={!r})".format( # noqa: UP032
self.enabled,
self.enabled_as_of,
self.studio_override_enabled,
diff --git a/openedx/features/content_type_gating/tests/test_access.py b/openedx/features/content_type_gating/tests/test_access.py
index edb7aafa2a6a..ba9a47f2a2d7 100644
--- a/openedx/features/content_type_gating/tests/test_access.py
+++ b/openedx/features/content_type_gating/tests/test_access.py
@@ -212,7 +212,7 @@ def setUpClass(cls):
# graded/has_score/weight for the test_graded_score_weight_values test.
cls.graded_score_weight_blocks = {}
for graded, has_score, weight, gated in cls.GRADED_SCORE_WEIGHT_TEST_CASES: # noqa: B007
- case_name = ' Graded: ' + str(graded) + ' Has Score: ' + str(has_score) + ' Weight: ' + str(weight) # noqa: F841 # pylint: disable=line-too-long
+ case_name = ' Graded: ' + str(graded) + ' Has Score: ' + str(has_score) + ' Weight: ' + str(weight) # noqa: F841
block_args = {
'parent': cls.blocks_dict['vertical'],
# has_score is determined by XBlock type. It is not a value set on an instance of an XBlock.
diff --git a/openedx/features/course_duration_limits/tests/test_models.py b/openedx/features/course_duration_limits/tests/test_models.py
index cbf1505f4484..928cb004b227 100644
--- a/openedx/features/course_duration_limits/tests/test_models.py
+++ b/openedx/features/course_duration_limits/tests/test_models.py
@@ -210,7 +210,7 @@ def test_all_current_course_configs(self):
id=CourseLocator(test_org, 'test_course', f'run-{course_setting}')
)
CourseDurationLimitConfig.objects.create(
- course=test_course, enabled=course_setting, enabled_as_of=datetime(2018, 1, 1, tzinfo=ZoneInfo("UTC")) # lint-amnesty, pylint: disable=line-too-long
+ course=test_course, enabled=course_setting, enabled_as_of=datetime(2018, 1, 1, tzinfo=ZoneInfo("UTC")) # noqa: E501
)
with self.assertNumQueries(4):
@@ -268,7 +268,7 @@ def test_caching_global(self):
def test_caching_site(self):
site_cfg = SiteConfigurationFactory()
- site_config = CourseDurationLimitConfig(site=site_cfg.site, enabled=True, enabled_as_of=datetime(2018, 1, 1, tzinfo=ZoneInfo("UTC"))) # lint-amnesty, pylint: disable=line-too-long
+ site_config = CourseDurationLimitConfig(site=site_cfg.site, enabled=True, enabled_as_of=datetime(2018, 1, 1, tzinfo=ZoneInfo("UTC"))) # noqa: E501
site_config.save()
RequestCache.clear_all_namespaces()
@@ -309,7 +309,7 @@ def test_caching_org(self):
site_cfg = SiteConfigurationFactory.create(
site_values={'course_org_filter': course.org}
)
- org_config = CourseDurationLimitConfig(org=course.org, enabled=True, enabled_as_of=datetime(2018, 1, 1, tzinfo=ZoneInfo("UTC"))) # lint-amnesty, pylint: disable=line-too-long
+ org_config = CourseDurationLimitConfig(org=course.org, enabled=True, enabled_as_of=datetime(2018, 1, 1, tzinfo=ZoneInfo("UTC"))) # noqa: E501
org_config.save()
RequestCache.clear_all_namespaces()
@@ -345,7 +345,7 @@ def test_caching_org(self):
with self.assertNumQueries(0):
assert not CourseDurationLimitConfig.current(org=course.org).enabled
- site_config = CourseDurationLimitConfig(site=site_cfg.site, enabled=True, enabled_as_of=datetime(2018, 1, 1, tzinfo=ZoneInfo("UTC"))) # lint-amnesty, pylint: disable=line-too-long
+ site_config = CourseDurationLimitConfig(site=site_cfg.site, enabled=True, enabled_as_of=datetime(2018, 1, 1, tzinfo=ZoneInfo("UTC"))) # noqa: E501
site_config.save()
RequestCache.clear_all_namespaces()
@@ -359,7 +359,7 @@ def test_caching_course(self):
site_cfg = SiteConfigurationFactory.create(
site_values={'course_org_filter': course.org}
)
- course_config = CourseDurationLimitConfig(course=course, enabled=True, enabled_as_of=datetime(2018, 1, 1, tzinfo=ZoneInfo("UTC"))) # lint-amnesty, pylint: disable=line-too-long
+ course_config = CourseDurationLimitConfig(course=course, enabled=True, enabled_as_of=datetime(2018, 1, 1, tzinfo=ZoneInfo("UTC"))) # noqa: E501
course_config.save()
RequestCache.clear_all_namespaces()
@@ -395,7 +395,7 @@ def test_caching_course(self):
with self.assertNumQueries(0):
assert not CourseDurationLimitConfig.current(course_key=course.id).enabled
- site_config = CourseDurationLimitConfig(site=site_cfg.site, enabled=True, enabled_as_of=datetime(2018, 1, 1, tzinfo=ZoneInfo("UTC"))) # lint-amnesty, pylint: disable=line-too-long
+ site_config = CourseDurationLimitConfig(site=site_cfg.site, enabled=True, enabled_as_of=datetime(2018, 1, 1, tzinfo=ZoneInfo("UTC"))) # noqa: E501
site_config.save()
RequestCache.clear_all_namespaces()
@@ -404,7 +404,7 @@ def test_caching_course(self):
with self.assertNumQueries(0):
assert not CourseDurationLimitConfig.current(course_key=course.id).enabled
- org_config = CourseDurationLimitConfig(org=course.org, enabled=True, enabled_as_of=datetime(2018, 1, 1, tzinfo=ZoneInfo("UTC"))) # lint-amnesty, pylint: disable=line-too-long
+ org_config = CourseDurationLimitConfig(org=course.org, enabled=True, enabled_as_of=datetime(2018, 1, 1, tzinfo=ZoneInfo("UTC"))) # noqa: E501
org_config.save()
RequestCache.clear_all_namespaces()
diff --git a/openedx/features/course_experience/__init__.py b/openedx/features/course_experience/__init__.py
index 219fdafe5ec1..458645636083 100644
--- a/openedx/features/course_experience/__init__.py
+++ b/openedx/features/course_experience/__init__.py
@@ -19,7 +19,7 @@
)
# Waffle flag to let learners access a course before its start date.
-COURSE_PRE_START_ACCESS_FLAG = WaffleFlag(f'{WAFFLE_FLAG_NAMESPACE}.pre_start_access', __name__) # lint-amnesty, pylint: disable=toggle-missing-annotation
+COURSE_PRE_START_ACCESS_FLAG = WaffleFlag(f'{WAFFLE_FLAG_NAMESPACE}.pre_start_access', __name__) # pylint: disable=toggle-missing-annotation
# .. toggle_name: course_experience.enable_course_goals
# .. toggle_implementation: CourseWaffleFlag
@@ -29,7 +29,7 @@
# .. toggle_creation_date: 2017-09-11
# .. toggle_target_removal_date: None
# .. toggle_warning: This temporary feature toggle does not have a target removal date.
-ENABLE_COURSE_GOALS = CourseWaffleFlag(f'{WAFFLE_FLAG_NAMESPACE}.enable_course_goals', __name__) # lint-amnesty, pylint: disable=toggle-missing-annotation
+ENABLE_COURSE_GOALS = CourseWaffleFlag(f'{WAFFLE_FLAG_NAMESPACE}.enable_course_goals', __name__) # pylint: disable=toggle-missing-annotation
# .. toggle_name: course_experience.enable_ses_for_goalreminder
# .. toggle_implementation: CourseWaffleFlag
@@ -39,7 +39,7 @@
# .. toggle_creation_date: 2024-10-06
# .. toggle_target_removal_date: None
# .. toggle_warning: This temporary feature toggle does not have a target removal date.
-ENABLE_SES_FOR_GOALREMINDER = CourseWaffleFlag(f'{WAFFLE_FLAG_NAMESPACE}.enable_ses_for_goalreminder', __name__) # lint-amnesty, pylint: disable=toggle-missing-annotation
+ENABLE_SES_FOR_GOALREMINDER = CourseWaffleFlag(f'{WAFFLE_FLAG_NAMESPACE}.enable_ses_for_goalreminder', __name__) # pylint: disable=toggle-missing-annotation
# Waffle flag to enable anonymous access to a course
SEO_WAFFLE_FLAG_NAMESPACE = 'seo'
@@ -57,7 +57,7 @@
# .. toggle_warning: To set a relative due date for self-paced courses, the weeks_to_complete field for a course run
# needs to be set. Currently it can be set through the publisher app.
# .. toggle_tickets: https://openedx.atlassian.net/browse/AA-27
-RELATIVE_DATES_FLAG = CourseWaffleFlag(f'{WAFFLE_FLAG_NAMESPACE}.relative_dates', __name__) # lint-amnesty, pylint: disable=toggle-missing-annotation
+RELATIVE_DATES_FLAG = CourseWaffleFlag(f'{WAFFLE_FLAG_NAMESPACE}.relative_dates', __name__) # pylint: disable=toggle-missing-annotation
# .. toggle_name: course_experience.relative_dates_disable_reset
# .. toggle_implementation: CourseWaffleFlag
@@ -81,7 +81,7 @@
# .. toggle_creation_date: 2021-01-26
# .. toggle_target_removal_date: 2021-04-26
# .. toggle_tickets: https://openedx.atlassian.net/browse/AA-36
-CALENDAR_SYNC_FLAG = CourseWaffleFlag(f'{WAFFLE_FLAG_NAMESPACE}.calendar_sync', __name__) # lint-amnesty, pylint: disable=toggle-missing-annotation
+CALENDAR_SYNC_FLAG = CourseWaffleFlag(f'{WAFFLE_FLAG_NAMESPACE}.calendar_sync', __name__) # pylint: disable=toggle-missing-annotation
# .. toggle_name: course_experience.enforce_masquerade_start_dates
# .. toggle_implementation: CourseWaffleFlag
diff --git a/openedx/features/course_experience/api/v1/utils.py b/openedx/features/course_experience/api/v1/utils.py
index 0d607698a35e..59dc983e06cd 100644
--- a/openedx/features/course_experience/api/v1/utils.py
+++ b/openedx/features/course_experience/api/v1/utils.py
@@ -37,7 +37,7 @@ def reset_course_deadlines_for_user(user, course_key):
return False
-def reset_bulk_course_deadlines(request, course_keys, research_event_data={}): # lint-amnesty, pylint: disable=dangerous-default-value # noqa: B006
+def reset_bulk_course_deadlines(request, course_keys, research_event_data={}): # lint-amnesty, pylint: disable=dangerous-default-value # noqa: B006, E501
"""
Reset deadlines for multiple courses for the requesting user.
@@ -82,7 +82,7 @@ def reset_bulk_course_deadlines(request, course_keys, research_event_data={}):
return success_course_keys, failed_course_keys
-def reset_deadlines_for_course(request, course_key, research_event_data={}): # lint-amnesty, pylint: disable=dangerous-default-value # noqa: B006
+def reset_deadlines_for_course(request, course_key, research_event_data={}): # lint-amnesty, pylint: disable=dangerous-default-value # noqa: B006, E501
"""
Set the start_date of a schedule to today, which in turn will adjust due dates for
sequentials belonging to a self paced course
diff --git a/openedx/features/course_experience/utils.py b/openedx/features/course_experience/utils.py
index ab1a58bee16d..aa0d2f11808f 100644
--- a/openedx/features/course_experience/utils.py
+++ b/openedx/features/course_experience/utils.py
@@ -15,7 +15,7 @@
@request_cached()
-def get_course_outline_block_tree(request, course_id, user=None, allow_start_dates_in_future=False): # lint-amnesty, pylint: disable=too-many-statements
+def get_course_outline_block_tree(request, course_id, user=None, allow_start_dates_in_future=False): # pylint: disable=too-many-statements
"""
Returns the root block of the course outline, with children as blocks.
diff --git a/openedx/features/course_experience/views/course_updates.py b/openedx/features/course_experience/views/course_updates.py
index 6789172f3606..2961a402a0a1 100644
--- a/openedx/features/course_experience/views/course_updates.py
+++ b/openedx/features/course_experience/views/course_updates.py
@@ -29,7 +29,7 @@ def get(self, request, course_id, **kwargs): # lint-amnesty, pylint: disable=ar
"""
return super().get(request, course_id, 'courseware', **kwargs)
- def render_to_fragment(self, request, course=None, tab=None, **kwargs): # lint-amnesty, pylint: disable=arguments-differ, unused-argument
+ def render_to_fragment(self, request, course=None, tab=None, **kwargs): # pylint: disable=arguments-differ, unused-argument
course_id = str(course.id)
updates_fragment_view = CourseUpdatesFragmentView()
return updates_fragment_view.render_to_fragment(request, course_id=course_id, **kwargs)
diff --git a/openedx/features/discounts/tests/test_applicability.py b/openedx/features/discounts/tests/test_applicability.py
index 51fb56460611..d2eaf0904e1b 100644
--- a/openedx/features/discounts/tests/test_applicability.py
+++ b/openedx/features/discounts/tests/test_applicability.py
@@ -80,8 +80,8 @@ def test_can_receive_discount_course_requirements(self):
assert applicability is False
disabled_course = CourseFactory()
- CourseModeFactory.create(course_id=disabled_course.id, mode_slug='verified') # lint-amnesty, pylint: disable=no-member
- disabled_course_overview = CourseOverview.get_from_id(disabled_course.id) # lint-amnesty, pylint: disable=no-member
+ CourseModeFactory.create(course_id=disabled_course.id, mode_slug='verified') # pylint: disable=no-member
+ disabled_course_overview = CourseOverview.get_from_id(disabled_course.id) # pylint: disable=no-member
DiscountRestrictionConfig.objects.create(disabled=True, course=disabled_course_overview)
applicability = can_receive_discount(user=self.user, course=disabled_course)
assert applicability is False
diff --git a/openedx/features/enterprise_support/api.py b/openedx/features/enterprise_support/api.py
index 504e377f45aa..b4c45a295a91 100644
--- a/openedx/features/enterprise_support/api.py
+++ b/openedx/features/enterprise_support/api.py
@@ -694,7 +694,7 @@ def consent_needed_for_course(request, user, course_id, enrollment_exists=False)
)
if not consent_required:
LOGGER.info(
- "[ENTERPRISE DSC] Consent from user [{username}] is not needed for course [{course_id}]. The user's current" # noqa: UP032 # pylint: disable=line-too-long
+ "[ENTERPRISE DSC] Consent from user [{username}] is not needed for course [{course_id}]. The user's current" # noqa: UP032
" enterprise does not require data sharing consent.".format(
username=user.username,
course_id=course_id
@@ -818,7 +818,7 @@ def get_active_enterprise_customer_user(user):
enterprise_customer_user = EnterpriseCustomerUser.objects.get(user_id=user.id, active=True)
except EnterpriseCustomerUser.DoesNotExist:
LOGGER.info(
- "Active EnterpriseCustomerUser for user [{username}] does not exist".format(username=user.username) # noqa: UP032 # pylint: disable=line-too-long
+ "Active EnterpriseCustomerUser for user [{username}] does not exist".format(username=user.username) # noqa: UP032
)
return None
return EnterpriseCustomerUserReadOnlySerializer(instance=enterprise_customer_user).data
diff --git a/openedx/features/enterprise_support/tasks.py b/openedx/features/enterprise_support/tasks.py
index f41da3031076..4167a272b480 100644
--- a/openedx/features/enterprise_support/tasks.py
+++ b/openedx/features/enterprise_support/tasks.py
@@ -25,7 +25,7 @@ def clear_enterprise_customer_data_consent_share_cache(enterprise_customer_uuid)
)
count = enterprise_course_enrollments.count()
log.info(
- 'Stated Clearing {count} data_sharing_consent_needed cache for enterprise customer {uuid}'.format( # noqa: UP032 # pylint: disable=line-too-long
+ 'Stated Clearing {count} data_sharing_consent_needed cache for enterprise customer {uuid}'.format( # noqa: UP032
count=count,
uuid=enterprise_customer_uuid,
)
diff --git a/openedx/features/enterprise_support/tests/test_api.py b/openedx/features/enterprise_support/tests/test_api.py
index 5a6689bbe6d2..334b1d434376 100644
--- a/openedx/features/enterprise_support/tests/test_api.py
+++ b/openedx/features/enterprise_support/tests/test_api.py
@@ -1371,7 +1371,7 @@ def test_unlink_enterprise_user_from_idp(self, mock_customer_from_request, mock_
provider_id='the-provider',
)
customer = customer_idp.enterprise_customer
- customer_user = EnterpriseCustomerUserFactory.create( # lint-amnesty, pylint: disable=unused-variable # noqa: F841
+ customer_user = EnterpriseCustomerUserFactory.create( # pylint: disable=unused-variable # noqa: F841
enterprise_customer=customer,
user_id=self.user.id,
)
diff --git a/openedx/features/enterprise_support/utils.py b/openedx/features/enterprise_support/utils.py
index 37b2aaa96c13..cc6402e60492 100644
--- a/openedx/features/enterprise_support/utils.py
+++ b/openedx/features/enterprise_support/utils.py
@@ -25,7 +25,7 @@
from openedx.core.djangoapps.user_authn.cookies import standard_cookie_settings
from openedx.core.djangolib.markup import HTML, Text
-ENTERPRISE_HEADER_LINKS = WaffleFlag('enterprise.enterprise_header_links', __name__) # lint-amnesty, pylint: disable=toggle-missing-annotation
+ENTERPRISE_HEADER_LINKS = WaffleFlag('enterprise.enterprise_header_links', __name__) # pylint: disable=toggle-missing-annotation
def get_data_consent_share_cache_key(user_id, course_id, enterprise_customer_uuid=None):
diff --git a/openedx/features/lti_course_tab/tab.py b/openedx/features/lti_course_tab/tab.py
index f1312c9a261c..4db0aa90531f 100644
--- a/openedx/features/lti_course_tab/tab.py
+++ b/openedx/features/lti_course_tab/tab.py
@@ -62,7 +62,7 @@ def _get_pii_lti_parameters(self, course: CourseBlock, request: HttpRequest) ->
pii_config['person_contact_email_primary'] = request.user.email
return pii_config
- def _get_additional_lti_parameters(self, course: CourseBlock, request: HttpRequest) -> Dict[str, str]: # noqa: UP006 # pylint: disable=line-too-long
+ def _get_additional_lti_parameters(self, course: CourseBlock, request: HttpRequest) -> Dict[str, str]: # noqa: UP006
"""
Get additional misc LTI parameters.
diff --git a/openedx/tests/completion_integration/test_services.py b/openedx/tests/completion_integration/test_services.py
index 680efbdd2d30..ced8bd4c4a9f 100644
--- a/openedx/tests/completion_integration/test_services.py
+++ b/openedx/tests/completion_integration/test_services.py
@@ -122,7 +122,7 @@ def _bind_course_block(self, block):
Bind a block (part of self.course) so we can access student-specific data.
"""
prepare_block_runtime(block.runtime, course_id=block.location.course_key)
- block.runtime._services.update({'library_tools': LegacyLibraryToolsService(self.store, self.user.id)}) # lint-amnesty, pylint: disable=protected-access
+ block.runtime._services.update({'library_tools': LegacyLibraryToolsService(self.store, self.user.id)}) # pylint: disable=protected-access
def get_block(descriptor):
"""Mocks module_system get_block_for_descriptor function"""
diff --git a/pylintrc b/pylintrc
index 43f2b3bc9eb8..7404ca694fd5 100644
--- a/pylintrc
+++ b/pylintrc
@@ -64,7 +64,7 @@
# SERIOUSLY.
#
# ------------------------------
-# Generated by edx-lint version: 5.6.0
+# Generated by edx-lint version: 6.0.0
# ------------------------------
[MASTER]
ignore = ,.git,.tox,migrations,node_modules,.pycharm_helpers
@@ -317,7 +317,11 @@ disable =
too-many-positional-arguments,
possibly-used-before-assignment,
use-dict-literal,
- superfluous-parens
+ superfluous-parens,
+ unused-import,
+ undefined-variable,
+ bare-except,
+ line-too-long
[REPORTS]
output-format = text
@@ -414,4 +418,4 @@ int-import-graph =
[EXCEPTIONS]
overgeneral-exceptions = builtins.Exception
-# d6e4348dec0a8eb2752fc4fe02315286c298aeff
+# 4fd13ce7d1b6a5a869866e0c90dad63487c03379
diff --git a/pylintrc_tweaks b/pylintrc_tweaks
index 149433fa905c..324ad46de750 100644
--- a/pylintrc_tweaks
+++ b/pylintrc_tweaks
@@ -36,7 +36,14 @@ disable+ =
too-many-positional-arguments,
possibly-used-before-assignment,
use-dict-literal,
- superfluous-parens
+ superfluous-parens,
+ # Covered by ruff F rules
+ unused-import,
+ undefined-variable,
+ # Covered by ruff E722
+ bare-except,
+ # Covered by ruff E501
+ line-too-long
[BASIC]
attr-rgx = [a-z_][a-z0-9_]{2,40}$
diff --git a/pyproject.toml b/pyproject.toml
index 40f0d3b0fcb8..89039d2b722f 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -217,13 +217,10 @@ exclude = [
]
[tool.ruff.lint]
-select = ["E", "W", "I", "F", "PT", "DJ", "UP", "B"]
+select = ["E", "W", "I", "F", "PT", "DJ", "UP", "B", "RUF100"]
ignore = [
"E402", # module level import not at top of file
- "E501", # line too long (pylint enforces this at 120 chars while ignoring trailing comments)
- "E722", # do not use bare 'except'
"E731", # do not assign a lambda expression
- "E741", # ambiguous variable name. TODO: fix the ~9 issues and re-enable this.
# The rules below were added in pycodestyle 2.9.x but we were pinned to 2.8.x,
# so they represent new findings. Keeping them ignored here to make this an
# equivalent swap; they can be cleaned up in a follow-up.
diff --git a/scripts/compile_sass.py b/scripts/compile_sass.py
index 72d17edd22b1..e381df978fb8 100755
--- a/scripts/compile_sass.py
+++ b/scripts/compile_sass.py
@@ -290,7 +290,7 @@ def compile_sass_dir(
if skip_lms and skip_cms:
click.secho("WARNING: You are skipping both LMS and CMS... nothing will be compiled!", fg="yellow")
if skip_default and skip_themes:
- click.secho("WARNING: You are skipped both default Sass and themed Sass... nothing will be compiled!", fg="yellow")
+ click.secho("WARNING: You are skipped both default Sass and themed Sass... nothing will be compiled!", fg="yellow") # noqa: E501
click.echo()
# Build a list of theme paths:
diff --git a/scripts/structures_pruning/tests/test_splitmongo.py b/scripts/structures_pruning/tests/test_splitmongo.py
index 03bde213d073..38c7bc609a87 100644
--- a/scripts/structures_pruning/tests/test_splitmongo.py
+++ b/scripts/structures_pruning/tests/test_splitmongo.py
@@ -178,7 +178,6 @@ def test_details_output(self):
plan = ChangePlan.create(graph, 0, False, False, buff)
details_txt = buff.getvalue()
- # pylint: disable=line-too-long
expected_output = textwrap.dedent(
"""
== Summary ==
@@ -201,9 +200,8 @@ def test_details_output(self):
- 5
+ 4 (original)
- """
+ """ # noqa: E501
).lstrip()
- # pylint: enable=line-too-long
self.assertEqual(expected_output, details_txt) # noqa: PT009
self.assertEqual( # noqa: PT009
plan,
diff --git a/scripts/structures_pruning/utils/splitmongo.py b/scripts/structures_pruning/utils/splitmongo.py
index 8b79c31233f5..dc7aa54af1f6 100644
--- a/scripts/structures_pruning/utils/splitmongo.py
+++ b/scripts/structures_pruning/utils/splitmongo.py
@@ -289,8 +289,8 @@ def create(cls, structures_graph, num_intermediate_structures, ignore_missing, d
save = sid in structure_ids_to_save
active = sid in active_structure_ids
relink = sid in set_parent_to_original
- prev_misssing = structures[sid].previous_id is not None and structures[sid].previous_id not in structures
- LOG.info(f"DUMP id: {sid}, original_id: {structures[sid].original_id}, previous_id: {structures[sid].previous_id}, save: {save}, active: {active}, prev_missing: {prev_misssing}, rewrite_previous_to_original: {relink}")
+ prev_misssing = structures[sid].previous_id is not None and structures[sid].previous_id not in structures # noqa: E501
+ LOG.info(f"DUMP id: {sid}, original_id: {structures[sid].original_id}, previous_id: {structures[sid].previous_id}, save: {save}, active: {active}, prev_missing: {prev_misssing}, rewrite_previous_to_original: {relink}") # noqa: E501
for missing_structure_id in missing_structure_ids:
active_structure_ids = {branch.structure_id for branch in branches}
@@ -333,8 +333,8 @@ def create(cls, structures_graph, num_intermediate_structures, ignore_missing, d
save = sid in structure_ids_to_save
active = sid in active_structure_ids
relink = sid in set_parent_to_original
- prev_misssing = structures[sid].previous_id is not None and structures[sid].previous_id not in structures
- LOG.info(f"id: {sid}, original_id: {structures[sid].original_id}, previous_id: {structures[sid].previous_id}, save: {save}, active: {active}, prev_missing: {prev_misssing}, rewrite_previous_to_original: {relink}")
+ prev_misssing = structures[sid].previous_id is not None and structures[sid].previous_id not in structures # noqa: E501
+ LOG.info(f"id: {sid}, original_id: {structures[sid].original_id}, previous_id: {structures[sid].previous_id}, save: {save}, active: {active}, prev_missing: {prev_misssing}, rewrite_previous_to_original: {relink}") # noqa: E501
return change_plan
diff --git a/scripts/unit_test_shards_parser.py b/scripts/unit_test_shards_parser.py
index 7cccb42c8938..247d77b6db6a 100644
--- a/scripts/unit_test_shards_parser.py
+++ b/scripts/unit_test_shards_parser.py
@@ -8,7 +8,7 @@ def load_unit_test_shards(shard_name):
with open(unit_tests_json) as file:
unit_test_workflow_shards = json.load(file)
if shard_name not in unit_test_workflow_shards:
- sys.stdout.write("Error, invalid shard name provided. please provide a valid shard name as specified in unit-test-shards.json")
+ sys.stdout.write("Error, invalid shard name provided. please provide a valid shard name as specified in unit-test-shards.json") # noqa: E501
return unit_test_workflow_shards
@@ -33,7 +33,7 @@ def get_output(shard_name, output_argument):
argument = parser.parse_args()
if not argument.shard_name:
- sys.exit("Error, no shard name provided. please provide a valid shard name as specified in unit-test-shards.json")
+ sys.exit("Error, no shard name provided. please provide a valid shard name as specified in unit-test-shards.json") # noqa: E501
output = get_output(argument.shard_name, argument.output)
print(output)
diff --git a/scripts/user_retirement/get_learners_to_retire.py b/scripts/user_retirement/get_learners_to_retire.py
index 0b8d4e1cddd3..8bb9c2d750c1 100755
--- a/scripts/user_retirement/get_learners_to_retire.py
+++ b/scripts/user_retirement/get_learners_to_retire.py
@@ -46,7 +46,7 @@
)
@click.option(
'--max_user_batch_size',
- help="This setting will only get at most X number of users. If this number is lower than the user_count_error_threshold"
+ help="This setting will only get at most X number of users. If this number is lower than the user_count_error_threshold" # noqa: E501
"setting then it will not error.",
default=200
)
diff --git a/scripts/user_retirement/retirement_archive_and_cleanup.py b/scripts/user_retirement/retirement_archive_and_cleanup.py
index e7211101b813..16cc04bca8c4 100644
--- a/scripts/user_retirement/retirement_archive_and_cleanup.py
+++ b/scripts/user_retirement/retirement_archive_and_cleanup.py
@@ -203,7 +203,7 @@ def _cleanup_retirements_or_exit(config, learners, redacted_username='redacted',
"""
LOG('Cleaning up retirements for {} learners'.format(len(learners))) # noqa: UP032
try:
- usernames = [l['original_username'] for l in learners]
+ usernames = [learner['original_username'] for learner in learners]
config['LMS'].bulk_cleanup_retirements(
usernames, redacted_username, redacted_email, redacted_name
)
diff --git a/scripts/user_retirement/retirement_partner_report.py b/scripts/user_retirement/retirement_partner_report.py
index 905595366430..b1cc6137b687 100755
--- a/scripts/user_retirement/retirement_partner_report.py
+++ b/scripts/user_retirement/retirement_partner_report.py
@@ -64,7 +64,7 @@
# tags: space delimited list of google user tags, e.g. "+user1@gmail.com +user2@gmail.com"
NOTIFICATION_MESSAGE_TEMPLATE = """
Hello from edX. Dear {tags}, a new report listing the learners enrolled in your institution’s courses on edx.org that have requested deletion of their edX account and associated personal data within the last week has been published to Google Drive. Please access your folder to see the latest report.
-""".strip()
+""".strip() # noqa: E501
LEARNER_CREATED_KEY = 'created' # This key is currently required to exist in the learner
LEARNER_ORIGINAL_USERNAME_KEY = 'original_username' # This key is currently required to exist in the learner
diff --git a/scripts/xblock/xblock_counts.py b/scripts/xblock/xblock_counts.py
index bcde55da7d41..e13b1105cfd0 100644
--- a/scripts/xblock/xblock_counts.py
+++ b/scripts/xblock/xblock_counts.py
@@ -299,7 +299,7 @@ def write_course_block_detail_report(course_data):
quotechar='"',
quoting=csv.QUOTE_ALL
)
- detail_writer.writerow(['XBLOCK_TYPE_NAME', 'COURSE_NAME', 'COURSE_ID', 'COURSE_START', 'COURSE_END', 'NUM_XBLOCK_INSTANCES'])
+ detail_writer.writerow(['XBLOCK_TYPE_NAME', 'COURSE_NAME', 'COURSE_ID', 'COURSE_START', 'COURSE_END', 'NUM_XBLOCK_INSTANCES']) # noqa: E501
for course in course_data:
for block_type, count in course.get(BLOCK_COUNTS_KEY, []).items():
if count > 0:
diff --git a/scripts/xsslint/tests/test_linters.py b/scripts/xsslint/tests/test_linters.py
index 8641958f6646..c548d84f386e 100644
--- a/scripts/xsslint/tests/test_linters.py
+++ b/scripts/xsslint/tests/test_linters.py
@@ -245,7 +245,7 @@ class TestJavaScriptLinter(TestLinter):
},
{'template': ' // var m = "" + commentedOutMessage + "
"', 'rule': None},
{'template': 'var m = " " + message + "
"', 'rule': JAVASCRIPT_LINTER_RULESET.javascript_concat_html},
- {'template': 'var m = " " + message + " broken string', 'rule': JAVASCRIPT_LINTER_RULESET.javascript_concat_html},
+ {'template': 'var m = "
" + message + " broken string', 'rule': JAVASCRIPT_LINTER_RULESET.javascript_concat_html}, # noqa: E501
)
def test_concat_with_html(self, data):
"""
@@ -273,8 +273,8 @@ def test_concat_with_html(self, data):
{'template': 'test.append($("
"))', 'rule': None},
{'template': 'test.append(HtmlUtils.ensureHtml(htmlSnippet).toString())', 'rule': None},
{'template': 'HtmlUtils.append($el, someHtml)', 'rule': None},
- {'template': 'test.append("fail on concat" + test.render().el)', 'rule': JAVASCRIPT_LINTER_RULESET.javascript_jquery_append},
- {'template': 'test.append("fail on concat" + testEl)', 'rule': JAVASCRIPT_LINTER_RULESET.javascript_jquery_append},
+ {'template': 'test.append("fail on concat" + test.render().el)', 'rule': JAVASCRIPT_LINTER_RULESET.javascript_jquery_append}, # noqa: E501
+ {'template': 'test.append("fail on concat" + testEl)', 'rule': JAVASCRIPT_LINTER_RULESET.javascript_jquery_append}, # noqa: E501
{'template': 'test.append(message)', 'rule': JAVASCRIPT_LINTER_RULESET.javascript_jquery_append},
)
def test_jquery_append(self, data):
@@ -301,8 +301,8 @@ def test_jquery_append(self, data):
{'template': 'test.prepend(HtmlUtils.ensureHtml(htmlSnippet).toString())', 'rule': None},
{'template': 'HtmlUtils.prepend($el, someHtml)', 'rule': None},
{'template': 'test.prepend("broken string)', 'rule': JAVASCRIPT_LINTER_RULESET.javascript_jquery_prepend},
- {'template': 'test.prepend("fail on concat" + test.render().el)', 'rule': JAVASCRIPT_LINTER_RULESET.javascript_jquery_prepend},
- {'template': 'test.prepend("fail on concat" + testEl)', 'rule': JAVASCRIPT_LINTER_RULESET.javascript_jquery_prepend},
+ {'template': 'test.prepend("fail on concat" + test.render().el)', 'rule': JAVASCRIPT_LINTER_RULESET.javascript_jquery_prepend}, # noqa: E501
+ {'template': 'test.prepend("fail on concat" + testEl)', 'rule': JAVASCRIPT_LINTER_RULESET.javascript_jquery_prepend}, # noqa: E501
{'template': 'test.prepend(message)', 'rule': JAVASCRIPT_LINTER_RULESET.javascript_jquery_prepend},
)
def test_jquery_prepend(self, data):
@@ -360,11 +360,11 @@ def test_jquery_insertion(self, data):
{'template': 'testEl.prependTo(target);', 'rule': None},
{'template': 'testEl.insertAfter(target);', 'rule': None},
{'template': 'testEl.insertBefore(target);', 'rule': None},
- {'template': 'anycall().appendTo(target)', 'rule': JAVASCRIPT_LINTER_RULESET.javascript_jquery_insert_into_target},
- {'template': 'anything.appendTo(target)', 'rule': JAVASCRIPT_LINTER_RULESET.javascript_jquery_insert_into_target},
- {'template': 'anything.prependTo(target)', 'rule': JAVASCRIPT_LINTER_RULESET.javascript_jquery_insert_into_target},
- {'template': 'anything.insertAfter(target)', 'rule': JAVASCRIPT_LINTER_RULESET.javascript_jquery_insert_into_target},
- {'template': 'anything.insertBefore(target)', 'rule': JAVASCRIPT_LINTER_RULESET.javascript_jquery_insert_into_target},
+ {'template': 'anycall().appendTo(target)', 'rule': JAVASCRIPT_LINTER_RULESET.javascript_jquery_insert_into_target}, # noqa: E501
+ {'template': 'anything.appendTo(target)', 'rule': JAVASCRIPT_LINTER_RULESET.javascript_jquery_insert_into_target}, # noqa: E501
+ {'template': 'anything.prependTo(target)', 'rule': JAVASCRIPT_LINTER_RULESET.javascript_jquery_insert_into_target}, # noqa: E501
+ {'template': 'anything.insertAfter(target)', 'rule': JAVASCRIPT_LINTER_RULESET.javascript_jquery_insert_into_target}, # noqa: E501
+ {'template': 'anything.insertBefore(target)', 'rule': JAVASCRIPT_LINTER_RULESET.javascript_jquery_insert_into_target}, # noqa: E501
)
def test_jquery_insert_to_target(self, data):
"""
@@ -436,8 +436,8 @@ class TestPythonLinter(TestLinter):
{'template': 'm = "Plain text " + message + "plain text"', 'rule': None},
{'template': 'm = "檌檒濦 " + message + "plain text"', 'rule': None},
{'template': ' # m = "" + commentedOutMessage + "
"', 'rule': None},
- {'template': 'm = "" + message + "
"', 'rule': [PYTHON_LINTER_RULESET.python_concat_html, PYTHON_LINTER_RULESET.python_concat_html]},
- {'template': 'm = " " + message + "
"', 'rule': [PYTHON_LINTER_RULESET.python_concat_html, PYTHON_LINTER_RULESET.python_concat_html]},
+ {'template': 'm = "" + message + "
"', 'rule': [PYTHON_LINTER_RULESET.python_concat_html, PYTHON_LINTER_RULESET.python_concat_html]}, # noqa: E501
+ {'template': 'm = " " + message + "
"', 'rule': [PYTHON_LINTER_RULESET.python_concat_html, PYTHON_LINTER_RULESET.python_concat_html]}, # noqa: E501
{'template': 'm = " " + message + " broken string', 'rule': PYTHON_LINTER_RULESET.python_parse_error},
)
def test_concat_with_html(self, data):
@@ -526,7 +526,7 @@ def test_check_custom_escaping(self):
link_end=HTML(""),
))
"""),
- 'rule': [PYTHON_LINTER_RULESET.python_close_before_format, PYTHON_LINTER_RULESET.python_requires_html_or_text]
+ 'rule': [PYTHON_LINTER_RULESET.python_close_before_format, PYTHON_LINTER_RULESET.python_requires_html_or_text] # noqa: E501
},
{
'python':
@@ -879,7 +879,7 @@ def test_check_mako_expression_display_name(self):
text = _("Introductions, prerequisites, FAQs that are used on %s (formatted in HTML)") % a_link
%>
"""),
- 'rule': [MAKO_LINTER_RULESET.python_wrap_html, MAKO_LINTER_RULESET.python_concat_html, MAKO_LINTER_RULESET.python_wrap_html]
+ 'rule': [MAKO_LINTER_RULESET.python_wrap_html, MAKO_LINTER_RULESET.python_concat_html, MAKO_LINTER_RULESET.python_wrap_html] # noqa: E501
},
{
'expression':
@@ -1475,7 +1475,7 @@ class TestDjangoTemplateLinter(TestLinter):
{'expression': """
{% trans "{span_start} whatever {span_end}" as tmsg %}
{% interpolate_html %}
- """, 'rule': [DJANGO_LINTER_RULESET.django_html_interpolation_missing, DJANGO_LINTER_RULESET.django_html_interpolation_invalid_tag]},
+ """, 'rule': [DJANGO_LINTER_RULESET.django_html_interpolation_missing, DJANGO_LINTER_RULESET.django_html_interpolation_invalid_tag]}, # noqa: E501
{'expression': """
{% trans "{span_start} whatever {span_end}" as tmsg %}
diff --git a/scripts/xsslint/xss_linter.py b/scripts/xsslint/xss_linter.py
index ebfa1a090978..24f95c49621d 100755
--- a/scripts/xsslint/xss_linter.py
+++ b/scripts/xsslint/xss_linter.py
@@ -257,7 +257,6 @@ def main():
epilog = "For more help using the xss linter, including details on how to\n"
epilog += "understand and fix any violations, read the docs here:\n"
epilog += "\n"
- # pylint: disable=line-too-long
epilog += " https://docs.openedx.org/en/latest/developers/references/developer_guide/preventing_xss/preventing_xss.html#xss-linter\n"
parser = argparse.ArgumentParser(
diff --git a/scripts/xsslint/xsslint/linters.py b/scripts/xsslint/xsslint/linters.py
index a0e0136ff5ad..639585554587 100644
--- a/scripts/xsslint/xsslint/linters.py
+++ b/scripts/xsslint/xsslint/linters.py
@@ -394,7 +394,7 @@ def check_javascript_file_is_safe(self, file_contents, results):
)
self._check_jquery_function(
file_contents, "appendTo|prependTo|insertAfter|insertBefore",
- self.ruleset.javascript_jquery_insert_into_target, self._is_jquery_insert_caller_safe, no_argument_check, results
+ self.ruleset.javascript_jquery_insert_into_target, self._is_jquery_insert_caller_safe, no_argument_check, results # noqa: E501
)
self._check_jquery_function(
file_contents, "html", self.ruleset.javascript_jquery_html, no_caller_check,
@@ -1361,7 +1361,7 @@ def _get_contexts(self, mako_template):
| # webpack script tag end
<%block[ ]*name=['"]requirejs['"]\w*(? | # require js tag start
# require js tag end
- """,
+ """, # noqa: E501
re.VERBOSE | re.IGNORECASE
)
media_type_re = re.compile(r"""type=['"].*?['"]""", re.IGNORECASE)
diff --git a/scripts/xsslint/xsslint/visitors.py b/scripts/xsslint/xsslint/visitors.py
index e72136f01b9c..d60a0f3631a9 100644
--- a/scripts/xsslint/xsslint/visitors.py
+++ b/scripts/xsslint/xsslint/visitors.py
@@ -56,7 +56,7 @@ def node_to_expression(self, node):
if node.col_offset == -1:
triple_quote_regex = re.compile("""['"]{3}""")
end_triple_quote_match = triple_quote_regex.search(self.file_contents, line_start_index)
- open_quote_index = self.file_contents.rfind(end_triple_quote_match.group(), 0, end_triple_quote_match.start())
+ open_quote_index = self.file_contents.rfind(end_triple_quote_match.group(), 0, end_triple_quote_match.start()) # noqa: E501
if open_quote_index > 0:
start_index = open_quote_index
else:
diff --git a/xmodule/annotatable_block.py b/xmodule/annotatable_block.py
index bbc1380b5640..975f5200db84 100644
--- a/xmodule/annotatable_block.py
+++ b/xmodule/annotatable_block.py
@@ -63,7 +63,7 @@ class _BuiltInAnnotatableBlock(
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut sodales laoreet est, egestas gravida felis egestas nec. Aenean at volutpat erat. Cras commodo viverra nibh in aliquam.
Nulla facilisi. Pellentesque id vestibulum libero. Suspendisse potenti. Morbi scelerisque nisi vitae felis dictum mattis. Nam sit amet magna elit. Nullam volutpat cursus est, sit amet sagittis odio vulputate et. Curabitur euismod, orci in vulputate imperdiet, augue lorem tempor purus, id aliquet augue turpis a est. Aenean a sagittis libero. Praesent fringilla pretium magna, non condimentum risus elementum nec. Pellentesque faucibus elementum pharetra. Pellentesque vitae metus eros.
- """).format(Text('<'), Text('>')))
+ """).format(Text('<'), Text('>'))) # noqa: E501
)
display_name = String(
display_name=_("Display Name"),
diff --git a/xmodule/assetstore/__init__.py b/xmodule/assetstore/__init__.py
index 52efe1223a8c..14708d8f02eb 100644
--- a/xmodule/assetstore/__init__.py
+++ b/xmodule/assetstore/__init__.py
@@ -177,7 +177,7 @@ def from_xml(self, node):
continue
elif tag == 'locked':
# Boolean.
- value = True if value == "true" else False # lint-amnesty, pylint: disable=simplifiable-if-expression
+ value = True if value == "true" else False # pylint: disable=simplifiable-if-expression
elif value == 'None':
# None.
value = None
diff --git a/xmodule/conditional_block.py b/xmodule/conditional_block.py
index 0cee399a676d..f18784aa4a9f 100644
--- a/xmodule/conditional_block.py
+++ b/xmodule/conditional_block.py
@@ -329,7 +329,7 @@ def definition_from_xml(cls, xml_object, system):
try:
block = system.process_xml(etree.tostring(child, encoding='unicode'))
children.append(block.scope_ids.usage_id)
- except: # lint-amnesty, pylint: disable=bare-except
+ except: # noqa: E722
msg = "Unable to load child when parsing Conditional."
log.exception(msg)
system.error_tracker(msg)
diff --git a/xmodule/contentstore/content.py b/xmodule/contentstore/content.py
index 25238fb906ac..ddcff6b621a3 100644
--- a/xmodule/contentstore/content.py
+++ b/xmodule/contentstore/content.py
@@ -29,7 +29,7 @@ class StaticContent: # lint-amnesty, pylint: disable=missing-class-docstring
def __init__(self, loc, name, content_type, data, last_modified_at=None, thumbnail_location=None, import_path=None,
length=None, locked=False, content_digest=None):
self.location = loc
- self.name = name # a display string which can be edited, and thus not part of the location which needs to be fixed # lint-amnesty, pylint: disable=line-too-long
+ self.name = name # a display string which can be edited, and thus not part of the location which needs to be fixed # noqa: E501
self.content_type = content_type
self._data = data
self.length = length
@@ -69,7 +69,7 @@ def generate_thumbnail_name(original_name, dimensions=None, extension=None):
)
@staticmethod
- def compute_location(course_key, path, revision=None, is_thumbnail=False): # lint-amnesty, pylint: disable=unused-argument
+ def compute_location(course_key, path, revision=None, is_thumbnail=False): # pylint: disable=unused-argument
"""
Constructs a location object for static content.
@@ -110,12 +110,12 @@ def is_c4x_path(path_string):
@staticmethod
def get_static_path_from_location(location):
"""
- This utility static method will take a location identifier and create a 'durable' /static/.. URL representation of it. # lint-amnesty, pylint: disable=line-too-long
- This link is 'durable' as it can maintain integrity across cloning of courseware across course-ids, e.g. reruns of # lint-amnesty, pylint: disable=line-too-long
+ This utility static method will take a location identifier and create a 'durable' /static/.. URL representation of it.
+ This link is 'durable' as it can maintain integrity across cloning of courseware across course-ids, e.g. reruns of
courses.
- In the LMS/CMS, we have runtime link-rewriting, so at render time, this /static/... format will get translated into # lint-amnesty, pylint: disable=line-too-long
+ In the LMS/CMS, we have runtime link-rewriting, so at render time, this /static/... format will get translated into
the actual /c4x/... path which the client needs to reference static content
- """
+ """ # noqa: E501
if location is not None:
return f"/static/{location.block_id}"
else:
@@ -307,7 +307,7 @@ def serialize_asset_key_with_slash(asset_key):
class StaticContentStream(StaticContent): # lint-amnesty, pylint: disable=missing-class-docstring
- def __init__(self, loc, name, content_type, stream, last_modified_at=None, thumbnail_location=None, import_path=None, # lint-amnesty, pylint: disable=line-too-long
+ def __init__(self, loc, name, content_type, stream, last_modified_at=None, thumbnail_location=None, import_path=None, # noqa: E501
length=None, locked=False, content_digest=None):
super().__init__(loc, name, content_type, None, last_modified_at=last_modified_at,
thumbnail_location=thumbnail_location, import_path=import_path,
diff --git a/xmodule/contentstore/mongo.py b/xmodule/contentstore/mongo.py
index 1cf65938a110..ffd1099a76e2 100644
--- a/xmodule/contentstore/mongo.py
+++ b/xmodule/contentstore/mongo.py
@@ -121,8 +121,8 @@ def save(self, content):
# the location as the _id, we must delete before adding (there's no replace method in gridFS)
self.delete(content_id) # delete is a noop if the entry doesn't exist; so, don't waste time checking
- thumbnail_location = content.thumbnail_location.to_deprecated_list_repr() if content.thumbnail_location else None # lint-amnesty, pylint: disable=line-too-long
- with self.fs.new_file(_id=content_id, filename=str(content.location), content_type=content.content_type, # lint-amnesty, pylint: disable=line-too-long
+ thumbnail_location = content.thumbnail_location.to_deprecated_list_repr() if content.thumbnail_location else None # noqa: E501
+ with self.fs.new_file(_id=content_id, filename=str(content.location), content_type=content.content_type,
displayname=content.name, content_son=content_son,
thumbnail_location=thumbnail_location,
import_path=content.import_path,
@@ -161,7 +161,7 @@ def delete(self, location_or_id):
# Deletes of non-existent files are considered successful
self.fs.delete(location_or_id)
- def find(self, location, throw_on_not_found=True, as_stream=False): # lint-amnesty, pylint: disable=arguments-differ
+ def find(self, location, throw_on_not_found=True, as_stream=False): # pylint: disable=arguments-differ
content_id, __ = self.asset_db_key(location)
try:
diff --git a/xmodule/course_block.py b/xmodule/course_block.py
index 53f593b42c88..39f7dc16a8f2 100644
--- a/xmodule/course_block.py
+++ b/xmodule/course_block.py
@@ -98,7 +98,7 @@ def to_json(self, value):
"""
try:
result = super().to_json(value)
- except: # lint-amnesty, pylint: disable=bare-except
+ except: # noqa: E722
return value
if result is None:
return value
@@ -204,7 +204,7 @@ def from_json(self, values): # lint-amnesty, pylint: disable=arguments-differ
for title, book_url in values:
try:
textbooks.append(Textbook(title, book_url))
- except: # lint-amnesty, pylint: disable=bare-except
+ except: # noqa: E722
# If we can't get to S3 (e.g. on a train with no internet), don't break
# the rest of the courseware.
log.exception(f"Couldn't load textbook ({title}, {book_url})")
@@ -1128,7 +1128,7 @@ def __init__(self, *args, **kwargs):
if not getattr(self, "tabs", []):
CourseTabList.initialize_default(self)
except InvalidTabsException as err:
- raise type(err)(f'{str(err)} For course: {str(self.id)}') # lint-amnesty, pylint: disable=line-too-long # noqa: B904
+ raise type(err)(f'{str(err)} For course: {str(self.id)}') # noqa: B904
def set_grading_policy(self, course_policy):
"""
@@ -1637,7 +1637,7 @@ def has_ended(self):
return course_metadata_utils.has_course_ended(self.end)
except TypeError as e:
log.warning(
- "Course '{course_id}' has an improperly formatted end date '{end_date}'. Error: '{err}'.".format( # noqa: UP032 # pylint: disable=line-too-long
+ "Course '{course_id}' has an improperly formatted end date '{end_date}'. Error: '{err}'.".format( # noqa: UP032
course_id=str(self.id), end_date=self.end, err=e
)
)
diff --git a/xmodule/error_block.py b/xmodule/error_block.py
index e3c5d775e4ec..fc958ab90d56 100644
--- a/xmodule/error_block.py
+++ b/xmodule/error_block.py
@@ -121,10 +121,10 @@ def get_context(self):
}
@classmethod
- def from_json(cls, json_data, system, location, error_msg='Error not available'): # lint-amnesty, pylint: disable=missing-function-docstring
+ def from_json(cls, json_data, system, location, error_msg='Error not available'): # pylint: disable=missing-function-docstring
try:
json_string = json.dumps(json_data, skipkeys=False, indent=4, cls=EdxJSONEncoder)
- except: # pylint: disable=bare-except
+ except: # noqa: E722
json_string = repr(json_data)
return cls._construct(
diff --git a/xmodule/html_block.py b/xmodule/html_block.py
index ef9f2745f92d..14ae7e2ec12b 100644
--- a/xmodule/html_block.py
+++ b/xmodule/html_block.py
@@ -221,7 +221,7 @@ def get_context(self):
# snippets that will be included in the middle of pages.
@classmethod
- def load_definition(cls, xml_object, system, location, id_generator): # lint-amnesty, pylint: disable=arguments-differ
+ def load_definition(cls, xml_object, system, location, id_generator): # pylint: disable=arguments-differ
'''Load a descriptor from the specified xml_object:
If there is a filename attribute, load it as a string, and
diff --git a/xmodule/lti_2_util.py b/xmodule/lti_2_util.py
index bad9849646fa..5fe0850248f3 100644
--- a/xmodule/lti_2_util.py
+++ b/xmodule/lti_2_util.py
@@ -288,7 +288,7 @@ def verify_lti_2_0_result_rest_headers(self, request, verify_content_type=True):
if verify_content_type and content_type != LTI_2_0_JSON_CONTENT_TYPE:
log.info(f"[LTI]: v2.0 result service -- bad Content-Type: {content_type}")
raise LTIError(
- "For LTI 2.0 result service, Content-Type must be {}. Got {}".format(LTI_2_0_JSON_CONTENT_TYPE, # noqa: UP032 # pylint: disable=line-too-long
+ "For LTI 2.0 result service, Content-Type must be {}. Got {}".format(LTI_2_0_JSON_CONTENT_TYPE, # noqa: UP032
content_type))
try:
self.verify_oauth_body_sign(request, content_type=LTI_2_0_JSON_CONTENT_TYPE)
@@ -329,7 +329,7 @@ def parse_lti_2_0_result_json(self, json_str):
if isinstance(json_obj, list) and len(json_obj) >= 1 and isinstance(json_obj[0], dict):
json_obj = json_obj[0]
else:
- msg = ("Supplied JSON string is a list that does not contain an object as the first element. {}" # noqa: UP032 # pylint: disable=line-too-long
+ msg = ("Supplied JSON string is a list that does not contain an object as the first element. {}" # noqa: UP032
.format(json_str))
log.info(f"[LTI] {msg}")
raise LTIError(msg)
diff --git a/xmodule/lti_block.py b/xmodule/lti_block.py
index 329d6fc14a9e..2bacfa007d30 100644
--- a/xmodule/lti_block.py
+++ b/xmodule/lti_block.py
@@ -220,7 +220,7 @@ class LTIFields:
)
# Users will be presented with a message indicating that their e-mail/username would be sent to a third
- # party application. When "Open in New Page" is not selected, the tool automatically appears without any user action. # lint-amnesty, pylint: disable=line-too-long
+ # party application. When "Open in New Page" is not selected, the tool automatically appears without any user action. # noqa: E501
ask_to_send_username = Boolean(
display_name=_("Request user's username"),
# Translators: This is used to request the user's username for a third party service.
@@ -239,7 +239,7 @@ class LTIFields:
description = String(
display_name=_("LTI Application Information"),
help=_(
- "Enter a description of the third party application. If requesting username and/or email, use this text box to inform users " # lint-amnesty, pylint: disable=line-too-long
+ "Enter a description of the third party application. If requesting username and/or email, use this text box to inform users " # noqa: E501
"why their username and/or email will be forwarded to a third party application."
),
default="",
@@ -691,7 +691,7 @@ def oauth_params(self, custom_parameters, client_key, client_secret):
except AttributeError:
self.user_email = "" # lint-amnesty, pylint: disable=attribute-defined-outside-init
try:
- self.user_username = real_user_object.username # lint-amnesty, pylint: disable=attribute-defined-outside-init
+ self.user_username = real_user_object.username # pylint: disable=attribute-defined-outside-init
except AttributeError:
self.user_username = "" # lint-amnesty, pylint: disable=attribute-defined-outside-init
@@ -740,7 +740,7 @@ def oauth_params(self, custom_parameters, client_key, client_secret):
# so '='' becomes '%3D'.
# We send form via browser, so browser will encode it again,
# So we need to decode signature back:
- params['oauth_signature'] = parse.unquote(params['oauth_signature']).encode('utf-8').decode('utf8') # lint-amnesty, pylint: disable=line-too-long
+ params['oauth_signature'] = parse.unquote(params['oauth_signature']).encode('utf-8').decode('utf8')
# Add LTI parameters to OAuth parameters for sending in form.
params.update(body)
@@ -887,7 +887,7 @@ def parse_grade_xml_body(cls, body):
imsx_messageIdentifier = root.xpath("//def:imsx_messageIdentifier", namespaces=namespaces)[0].text or ''
sourcedId = root.xpath("//def:sourcedId", namespaces=namespaces)[0].text
score = root.xpath("//def:textString", namespaces=namespaces)[0].text
- action = root.xpath("//def:imsx_POXBody", namespaces=namespaces)[0].getchildren()[0].tag.replace('{' + lti_spec_namespace + '}', '') # lint-amnesty, pylint: disable=line-too-long
+ action = root.xpath("//def:imsx_POXBody", namespaces=namespaces)[0].getchildren()[0].tag.replace('{' + lti_spec_namespace + '}', '') # noqa: E501
# Raise exception if score is not float or not in range 0.0-1.0 regarding spec.
score = float(score)
if not 0 <= score <= 1:
diff --git a/xmodule/modulestore/__init__.py b/xmodule/modulestore/__init__.py
index e75f720bc376..754427735e8c 100644
--- a/xmodule/modulestore/__init__.py
+++ b/xmodule/modulestore/__init__.py
@@ -74,8 +74,8 @@ class RevisionOption:
class Branch:
"""
Branch constants to use for stores, such as Mongo, that have only 2 branches: DRAFT and PUBLISHED
- Note: These values are taken from server configuration settings, so should not be changed without alerting DevOps # lint-amnesty, pylint: disable=line-too-long
- """
+ Note: These values are taken from server configuration settings, so should not be changed without alerting DevOps
+ """ # noqa: E501
draft_preferred = 'draft-preferred'
published_only = 'published-only'
@@ -299,7 +299,7 @@ def _end_bulk_operation(self, structure_key, emit_signals=True, ignore_case=Fals
if bulk_ops_record.active:
return
- dirty = self._end_outermost_bulk_operation(bulk_ops_record, structure_key) # lint-amnesty, pylint: disable=assignment-from-no-return
+ dirty = self._end_outermost_bulk_operation(bulk_ops_record, structure_key) # pylint: disable=assignment-from-no-return
# The bulk op has ended. However, the signal tasks below still need to use the
# built-up bulk op information (if the signals trigger tasks in the same thread).
@@ -627,7 +627,7 @@ def find_asset_metadata(self, asset_key, **kwargs):
mdata.from_storable(all_assets[asset_idx])
return mdata
- def get_all_asset_metadata(self, course_key, asset_type, start=0, maxresults=-1, sort=None, **kwargs): # lint-amnesty, pylint: disable=unused-argument
+ def get_all_asset_metadata(self, course_key, asset_type, start=0, maxresults=-1, sort=None, **kwargs): # pylint: disable=unused-argument
"""
Returns a list of asset metadata for all assets of the given asset_type in the course.
@@ -658,7 +658,7 @@ def get_all_asset_metadata(self, course_key, asset_type, start=0, maxresults=-1,
if asset_type is None:
# Add assets of all types to the sorted list.
all_assets = SortedAssetList(iterable=[], key=key_func)
- for asset_type, val in course_assets.items(): # lint-amnesty, pylint: disable=redefined-argument-from-local # noqa: B007
+ for asset_type, val in course_assets.items(): # lint-amnesty, pylint: disable=redefined-argument-from-local # noqa: B007, E501
all_assets.update(val)
else:
# Add assets of a single type to the sorted list.
@@ -714,7 +714,7 @@ def _save_assets_by_type(self, course_key, asset_metadata_list, course_assets, u
for asset_md in asset_metadata_list:
if asset_md.asset_id.course_key != course_key:
# pylint: disable=logging-format-interpolation
- log.warning("Asset's course {} does not match other assets for course {} - not saved.".format( # noqa: UP032 # pylint: disable=line-too-long
+ log.warning("Asset's course {} does not match other assets for course {} - not saved.".format( # noqa: UP032
asset_md.asset_id.course_key, course_key
))
continue
@@ -1317,7 +1317,7 @@ def partition_fields_by_scope(self, category, fields):
result[field.scope][field_name] = value
return result
- def create_course(self, org, course, run, user_id, fields=None, runtime=None, **kwargs): # lint-amnesty, pylint: disable=arguments-differ
+ def create_course(self, org, course, run, user_id, fields=None, runtime=None, **kwargs): # pylint: disable=arguments-differ
"""
Creates any necessary other things for the course as a side effect and doesn't return
anything useful. The real subclass should call this before it returns the course.
@@ -1338,7 +1338,7 @@ def create_course(self, org, course, run, user_id, fields=None, runtime=None, **
continue_version=True,
)
- def clone_course(self, source_course_id, dest_course_id, user_id, fields=None, **kwargs): # lint-amnesty, pylint: disable=unused-argument
+ def clone_course(self, source_course_id, dest_course_id, user_id, fields=None, **kwargs): # pylint: disable=unused-argument
"""
This base method just copies the assets. The lower level impls must do the actual cloning of
content.
@@ -1391,7 +1391,7 @@ def create_child(self, user_id, parent_usage_key, block_type, block_id=None, fie
fields (dict): A dictionary specifying initial values for some or all fields
in the newly created block
"""
- item = self.create_item(user_id, parent_usage_key.course_key, block_type, block_id=block_id, fields=fields, **kwargs) # lint-amnesty, pylint: disable=line-too-long
+ item = self.create_item(user_id, parent_usage_key.course_key, block_type, block_id=block_id, fields=fields, **kwargs) # noqa: E501
parent = self.get_item(parent_usage_key)
parent.children.append(item.location)
self.update_item(parent, user_id)
diff --git a/xmodule/modulestore/exceptions.py b/xmodule/modulestore/exceptions.py
index 9dae0788281e..038dcaaf12d6 100644
--- a/xmodule/modulestore/exceptions.py
+++ b/xmodule/modulestore/exceptions.py
@@ -103,7 +103,7 @@ class InvalidBranchSetting(Exception):
Raised when the process' branch setting did not match the required setting for the attempted operation on a store.
"""
def __init__(self, expected_setting, actual_setting):
- super().__init__(f"Invalid branch: expected {expected_setting} but got {actual_setting}") # lint-amnesty, pylint: disable=line-too-long, super-with-arguments
+ super().__init__(f"Invalid branch: expected {expected_setting} but got {actual_setting}") # pylint: disable=super-with-arguments
self.expected_setting = expected_setting
self.actual_setting = actual_setting
diff --git a/xmodule/modulestore/inheritance.py b/xmodule/modulestore/inheritance.py
index faa050fc5e2d..6d1d7f065b80 100644
--- a/xmodule/modulestore/inheritance.py
+++ b/xmodule/modulestore/inheritance.py
@@ -132,19 +132,19 @@ class InheritanceMixin(XBlockMixin):
)
static_asset_path = String(
display_name=_("Static Asset Path"),
- help=_("Enter the path to use for files on the Files & Uploads page. This value overrides the Studio default, c4x://."), # lint-amnesty, pylint: disable=line-too-long
+ help=_("Enter the path to use for files on the Files & Uploads page. This value overrides the Studio default, c4x://."),
scope=Scope.settings,
default='',
)
use_latex_compiler = Boolean(
display_name=_("Enable LaTeX Compiler"),
- help=_("Enter true or false. If true, you can use the LaTeX templates for HTML components and advanced Problem components."), # lint-amnesty, pylint: disable=line-too-long
+ help=_("Enter true or false. If true, you can use the LaTeX templates for HTML components and advanced Problem components."), # noqa: E501
default=False,
scope=Scope.settings
)
max_attempts = Integer(
display_name=_("Maximum Attempts"),
- help=_("Enter the maximum number of times a student can try to answer problems. By default, Maximum Attempts is set to null, meaning that students have an unlimited number of attempts for problems. You can override this course-wide setting for individual problems. However, if the course-wide setting is a specific number, you cannot set the Maximum Attempts for individual problems to unlimited."), # lint-amnesty, pylint: disable=line-too-long
+ help=_("Enter the maximum number of times a student can try to answer problems. By default, Maximum Attempts is set to null, meaning that students have an unlimited number of attempts for problems. You can override this course-wide setting for individual problems. However, if the course-wide setting is a specific number, you cannot set the Maximum Attempts for individual problems to unlimited."), # noqa: E501
values={"min": 0}, scope=Scope.settings
)
matlab_api_key = String(
@@ -173,7 +173,7 @@ class InheritanceMixin(XBlockMixin):
video_auto_advance = Boolean(
display_name=_("Enable video auto-advance"),
help=_(
- "Specify whether to show an auto-advance button in videos. If the student clicks it, when the last video in a unit finishes it will automatically move to the next unit and autoplay the first video." # lint-amnesty, pylint: disable=line-too-long
+ "Specify whether to show an auto-advance button in videos. If the student clicks it, when the last video in a unit finishes it will automatically move to the next unit and autoplay the first video." # noqa: E501
),
scope=Scope.settings,
default=False
diff --git a/xmodule/modulestore/mixed.py b/xmodule/modulestore/mixed.py
index 02e0af9a24c2..77f18691bb26 100644
--- a/xmodule/modulestore/mixed.py
+++ b/xmodule/modulestore/mixed.py
@@ -826,7 +826,7 @@ def import_xblock(self, user_id, course_key, block_type, block_id, fields=None,
return store.import_xblock(user_id, course_key, block_type, block_id, fields, runtime, **kwargs)
@strip_key
- def copy_from_template(self, source_keys, dest_key, user_id, **kwargs): # lint-amnesty, pylint: disable=unused-argument
+ def copy_from_template(self, source_keys, dest_key, user_id, **kwargs): # pylint: disable=unused-argument
"""
See :py:meth `SplitMongoModuleStore.copy_from_template`
"""
@@ -835,7 +835,7 @@ def copy_from_template(self, source_keys, dest_key, user_id, **kwargs): # lint-
@strip_key
@prepare_asides
- def update_item(self, xblock, user_id, allow_not_found=False, **kwargs): # lint-amnesty, pylint: disable=arguments-differ
+ def update_item(self, xblock, user_id, allow_not_found=False, **kwargs): # pylint: disable=arguments-differ
"""
Update the xblock persisted to be the same as the given for all types of fields
(content, children, and metadata) attribute the change to the given user.
diff --git a/xmodule/modulestore/modulestore_settings.py b/xmodule/modulestore/modulestore_settings.py
index 0bf49228c142..4d3fdc871e17 100644
--- a/xmodule/modulestore/modulestore_settings.py
+++ b/xmodule/modulestore/modulestore_settings.py
@@ -1,6 +1,6 @@
"""
-This file contains helper functions for configuring module_store_setting settings and support for backward compatibility with older formats. # lint-amnesty, pylint: disable=line-too-long
-"""
+This file contains helper functions for configuring module_store_setting settings and support for backward compatibility with older formats.
+""" # noqa: E501
import copy
@@ -27,7 +27,7 @@ def convert_old_stores_into_list(old_stores):
# migrate request for the old 'direct' Mongo store to the Draft store
if store_settings['ENGINE'] == 'xmodule.modulestore.mongo.MongoModuleStore':
- warnings.warn("MongoModuleStore is deprecated! Please use DraftModuleStore.", DeprecationWarning) # noqa: B028 # pylint: disable=line-too-long
+ warnings.warn("MongoModuleStore is deprecated! Please use DraftModuleStore.", DeprecationWarning) # noqa: B028
store_settings['ENGINE'] = 'xmodule.modulestore.mongo.draft.DraftModuleStore'
return new_store_list
@@ -37,7 +37,7 @@ def convert_old_stores_into_list(old_stores):
# Convert to Mixed, if needed
if module_store_setting['default']['ENGINE'] != 'xmodule.modulestore.mixed.MixedModuleStore':
- warnings.warn("Direct access to a modulestore is deprecated. Please use MixedModuleStore.", DeprecationWarning) # noqa: B028 # pylint: disable=line-too-long
+ warnings.warn("Direct access to a modulestore is deprecated. Please use MixedModuleStore.", DeprecationWarning) # noqa: B028
# convert to using mixed module_store
new_module_store_setting = {
@@ -110,10 +110,10 @@ def update_module_store_settings(
"""
for store in module_store_setting['default']['OPTIONS']['stores']:
if store['NAME'] == 'xml':
- xml_store_options and store['OPTIONS'].update(xml_store_options) # lint-amnesty, pylint: disable=expression-not-assigned
+ xml_store_options and store['OPTIONS'].update(xml_store_options) # pylint: disable=expression-not-assigned
else:
- module_store_options and store['OPTIONS'].update(module_store_options) # lint-amnesty, pylint: disable=expression-not-assigned
- doc_store_settings and store['DOC_STORE_CONFIG'].update(doc_store_settings) # lint-amnesty, pylint: disable=expression-not-assigned
+ module_store_options and store['OPTIONS'].update(module_store_options) # pylint: disable=expression-not-assigned
+ doc_store_settings and store['DOC_STORE_CONFIG'].update(doc_store_settings) # pylint: disable=expression-not-assigned
if default_store:
mixed_stores = get_mixed_stores(module_store_setting)
diff --git a/xmodule/modulestore/mongo/base.py b/xmodule/modulestore/mongo/base.py
index 1f0f78616c78..cd8400d47b66 100644
--- a/xmodule/modulestore/mongo/base.py
+++ b/xmodule/modulestore/mongo/base.py
@@ -289,7 +289,7 @@ def _convert_reference_to_key(self, ref_string):
key = UsageKey.from_string(ref_string)
return key.replace(run=self.modulestore.fill_in_run(key.course_key).run)
- def _convert_reference_fields_to_keys(self, class_, course_key, jsonfields): # lint-amnesty, pylint: disable=unused-argument
+ def _convert_reference_fields_to_keys(self, class_, course_key, jsonfields): # pylint: disable=unused-argument
"""
Find all fields of type reference and convert the payload into UsageKeys
:param class_: the XBlock class
@@ -907,7 +907,7 @@ def has_item(self, usage_key):
except ItemNotFoundError:
return False
- def get_item(self, usage_key, using_descriptor_system=None, for_parent=None, **kwargs): # lint-amnesty, pylint: disable=arguments-differ
+ def get_item(self, usage_key, using_descriptor_system=None, for_parent=None, **kwargs): # pylint: disable=arguments-differ
"""
Returns an XModuleDescriptor instance for the item at location.
@@ -1025,7 +1025,7 @@ def get_items( # lint-amnesty, pylint: disable=arguments-differ
)
return blocks
- def create_course(self, org, course, run, user_id, fields=None, **kwargs): # lint-amnesty, pylint: disable=arguments-differ
+ def create_course(self, org, course, run, user_id, fields=None, **kwargs): # pylint: disable=arguments-differ
"""
Creates and returns the course.
@@ -1135,7 +1135,7 @@ def create_xblock(
xblock.save()
return xblock
- def create_item(self, user_id, course_key, block_type, block_id=None, **kwargs): # lint-amnesty, pylint: disable=arguments-differ
+ def create_item(self, user_id, course_key, block_type, block_id=None, **kwargs): # pylint: disable=arguments-differ
"""
Creates and saves a new item in a course.
@@ -1161,7 +1161,7 @@ def create_item(self, user_id, course_key, block_type, block_id=None, **kwargs):
return xblock
- def create_child(self, user_id, parent_usage_key, block_type, block_id=None, **kwargs): # lint-amnesty, pylint: disable=arguments-differ
+ def create_child(self, user_id, parent_usage_key, block_type, block_id=None, **kwargs): # pylint: disable=arguments-differ
"""
Creates and saves a new xblock that as a child of the specified block
@@ -1497,7 +1497,7 @@ def heartbeat(self):
self.database.client.admin.command('ismaster')
return {ModuleStoreEnum.Type.mongo: True}
except pymongo.errors.ConnectionFailure:
- raise HeartbeatFailure(f"Can't connect to {self.database.name}", 'mongo') # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904
+ raise HeartbeatFailure(f"Can't connect to {self.database.name}", 'mongo') # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904, E501
def ensure_indexes(self):
"""
@@ -1552,6 +1552,6 @@ def revert_to_published(self, location, user_id):
def unpublish(self, location, user_id):
raise NotImplementedError()
- def update_item(self, xblock, user_id, allow_not_found=False, force=False, isPublish=False, # lint-amnesty, pylint: disable=arguments-differ
+ def update_item(self, xblock, user_id, allow_not_found=False, force=False, isPublish=False, # pylint: disable=arguments-differ
is_publish_root=True):
raise NotImplementedError
diff --git a/xmodule/modulestore/mongo/draft.py b/xmodule/modulestore/mongo/draft.py
index c9cd50c3fa5a..18ca5df1a4e2 100644
--- a/xmodule/modulestore/mongo/draft.py
+++ b/xmodule/modulestore/mongo/draft.py
@@ -47,7 +47,7 @@ class DraftModuleStore(MongoModuleStore):
This module store also includes functionality to promote DRAFT blocks (and their children)
to published blocks.
"""
- def get_item(self, usage_key, revision=None, using_descriptor_system=None, **kwargs): # lint-amnesty, pylint: disable=arguments-differ
+ def get_item(self, usage_key, revision=None, using_descriptor_system=None, **kwargs): # pylint: disable=arguments-differ
"""
Returns an XModuleDescriptor instance for the item at usage_key.
@@ -81,13 +81,13 @@ def get_item(self, usage_key, revision=None, using_descriptor_system=None, **kwa
is found at that usage_key
"""
def get_published():
- return wrap_draft(super(DraftModuleStore, self).get_item( # lint-amnesty, pylint: disable=super-with-arguments
+ return wrap_draft(super(DraftModuleStore, self).get_item( # pylint: disable=super-with-arguments
usage_key, using_descriptor_system=using_descriptor_system,
for_parent=kwargs.get('for_parent'),
))
def get_draft():
- return wrap_draft(super(DraftModuleStore, self).get_item( # lint-amnesty, pylint: disable=super-with-arguments
+ return wrap_draft(super(DraftModuleStore, self).get_item( # pylint: disable=super-with-arguments
as_draft(usage_key), using_descriptor_system=using_descriptor_system,
for_parent=kwargs.get('for_parent')
))
@@ -130,13 +130,13 @@ def has_item(self, usage_key, revision=None): # lint-amnesty, pylint: disable=a
ModuleStoreEnum.RevisionOption.draft_only - checks for the draft item only
None - uses the branch setting, as follows:
if branch setting is ModuleStoreEnum.Branch.published_only, checks for the published item only
- if branch setting is ModuleStoreEnum.Branch.draft_preferred, checks whether draft or published item exists # lint-amnesty, pylint: disable=line-too-long
- """
+ if branch setting is ModuleStoreEnum.Branch.draft_preferred, checks whether draft or published item exists
+ """ # noqa: E501
def has_published():
- return super(DraftModuleStore, self).has_item(usage_key) # lint-amnesty, pylint: disable=super-with-arguments
+ return super(DraftModuleStore, self).has_item(usage_key) # pylint: disable=super-with-arguments
def has_draft():
- return super(DraftModuleStore, self).has_item(as_draft(usage_key)) # lint-amnesty, pylint: disable=super-with-arguments
+ return super(DraftModuleStore, self).has_item(as_draft(usage_key)) # pylint: disable=super-with-arguments
if revision == ModuleStoreEnum.RevisionOption.draft_only:
return has_draft()
@@ -200,7 +200,7 @@ def _get_raw_parent_locations(self, location, key_revision):
# return only the parent(s) that satisfy the request
return [
- BlockUsageLocator._from_deprecated_son(parent['_id'], location.course_key.run) # lint-amnesty, pylint: disable=protected-access
+ BlockUsageLocator._from_deprecated_son(parent['_id'], location.course_key.run) # pylint: disable=protected-access
for parent in parents
if (
# return all versions of the parent if revision is ModuleStoreEnum.RevisionOption.all
@@ -237,9 +237,9 @@ def get_parent_location(self, location, revision=None, **kwargs):
revision = ModuleStoreEnum.RevisionOption.published_only \
if self.get_branch_setting() == ModuleStoreEnum.Branch.published_only \
else ModuleStoreEnum.RevisionOption.draft_preferred
- return super().get_parent_location(location, revision, **kwargs) # lint-amnesty, pylint: disable=super-with-arguments
+ return super().get_parent_location(location, revision, **kwargs) # pylint: disable=super-with-arguments
- def create_xblock(self, runtime, course_key, block_type, block_id=None, fields=None, **kwargs): # lint-amnesty, pylint: disable=arguments-differ
+ def create_xblock(self, runtime, course_key, block_type, block_id=None, fields=None, **kwargs): # pylint: disable=arguments-differ
"""
Create the new xblock but don't save it. Returns the new block with a draft locator if
the category allows drafts. If the category does not allow drafts, just creates a published block.
@@ -278,7 +278,7 @@ def get_items(self, course_key, revision=None, **kwargs): # lint-amnesty, pylin
returns either Draft or Published, preferring Draft items.
"""
def base_get_items(key_revision):
- return super(DraftModuleStore, self).get_items(course_key, key_revision=key_revision, **kwargs) # lint-amnesty, pylint: disable=super-with-arguments
+ return super(DraftModuleStore, self).get_items(course_key, key_revision=key_revision, **kwargs) # pylint: disable=super-with-arguments
def draft_items():
return [wrap_draft(item) for item in base_get_items(MongoRevisionKey.draft)]
diff --git a/xmodule/modulestore/perf_tests/generate_report.py b/xmodule/modulestore/perf_tests/generate_report.py
index fbecd33bbbd9..cf3d46ad6c88 100644
--- a/xmodule/modulestore/perf_tests/generate_report.py
+++ b/xmodule/modulestore/perf_tests/generate_report.py
@@ -128,7 +128,7 @@ def generate_html(self):
html = HTMLDocument("Results")
# Output comparison of each phase to a different table.
- for phase in self.run_data.keys(): # lint-amnesty, pylint: disable=consider-iterating-dictionary, too-many-nested-blocks
+ for phase in self.run_data.keys(): # pylint: disable=consider-iterating-dictionary, too-many-nested-blocks
if phase in ('fake_assets',):
continue
per_phase = self.run_data[phase]
diff --git a/xmodule/modulestore/perf_tests/test_asset_import_export.py b/xmodule/modulestore/perf_tests/test_asset_import_export.py
index 9d8df53414bb..8686ee6d868a 100644
--- a/xmodule/modulestore/perf_tests/test_asset_import_export.py
+++ b/xmodule/modulestore/perf_tests/test_asset_import_export.py
@@ -96,7 +96,7 @@ def test_generate_import_export_timings(self, source_ms, dest_ms, num_assets):
source_course_key = source_store.make_course_key('a', 'course', 'course')
dest_course_key = dest_store.make_course_key('a', 'course', 'course')
- with CodeBlockTimer("initial_import"): # lint-amnesty, pylint: disable=undefined-variable # noqa: F821
+ with CodeBlockTimer("initial_import"): # pylint: disable=undefined-variable # noqa: F821
import_course_from_xml(
source_store,
'test_user',
@@ -117,7 +117,7 @@ def test_generate_import_export_timings(self, source_ms, dest_ms, num_assets):
'exported_source_course',
)
- with CodeBlockTimer("second_import"): # lint-amnesty, pylint: disable=undefined-variable # noqa: F821
+ with CodeBlockTimer("second_import"): # pylint: disable=undefined-variable # noqa: F821
import_course_from_xml(
dest_store,
'test_user',
diff --git a/xmodule/modulestore/search.py b/xmodule/modulestore/search.py
index 2a7f308d07e7..02f353207699 100644
--- a/xmodule/modulestore/search.py
+++ b/xmodule/modulestore/search.py
@@ -152,7 +152,7 @@ def is_child_appendable(child_instance):
"""
Return True if child is appendable based on request and request's user type.
"""
- return (request and is_user_staff_and_not_masquerading_learner()) or not child_instance.visible_to_staff_only # lint-amnesty, pylint: disable=consider-using-ternary
+ return (request and is_user_staff_and_not_masquerading_learner()) or not child_instance.visible_to_staff_only # pylint: disable=consider-using-ternary
child_locs = []
for child in section_desc.get_children():
diff --git a/xmodule/modulestore/split_mongo/mongo_connection.py b/xmodule/modulestore/split_mongo/mongo_connection.py
index 6129d62e1b11..caf73dfcd490 100644
--- a/xmodule/modulestore/split_mongo/mongo_connection.py
+++ b/xmodule/modulestore/split_mongo/mongo_connection.py
@@ -317,7 +317,7 @@ def heartbeat(self):
self.database.client.admin.command('ismaster')
return True
except pymongo.errors.ConnectionFailure:
- raise HeartbeatFailure(f"Can't connect to {self.database.name}", 'mongo') # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904
+ raise HeartbeatFailure(f"Can't connect to {self.database.name}", 'mongo') # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904, E501
def check_connection(self):
"""
diff --git a/xmodule/modulestore/split_mongo/runtime.py b/xmodule/modulestore/split_mongo/runtime.py
index 01d351a430b3..866bca0ad151 100644
--- a/xmodule/modulestore/split_mongo/runtime.py
+++ b/xmodule/modulestore/split_mongo/runtime.py
@@ -35,7 +35,7 @@ class SplitModuleStoreRuntime(ModuleStoreRuntime, EditInfoRuntimeMixin): # pyli
Computes the settings (nee 'metadata') inheritance upon creation.
"""
- def __init__(self, modulestore, course_entry, default_class, module_data, lazy, **kwargs): # lint-amnesty, pylint: disable=redefined-outer-name
+ def __init__(self, modulestore, course_entry, default_class, module_data, lazy, **kwargs): # pylint: disable=redefined-outer-name
"""
Computes the settings inheritance and sets up the cache.
@@ -51,7 +51,7 @@ def __init__(self, modulestore, course_entry, default_class, module_data, lazy,
# needed by capa_problem (as runtime.resources_fs via this.resources_fs)
course_library = get_library_or_course_attribute(course_entry.course_key)
if course_library:
- root = modulestore.fs_root / course_entry.course_key.org / course_library / course_entry.course_key.run # lint-amnesty, pylint: disable=line-too-long
+ root = modulestore.fs_root / course_entry.course_key.org / course_library / course_entry.course_key.run
else:
root = modulestore.fs_root / str(course_entry.structure['_id'])
root.makedirs_p() # create directory if it doesn't exist
diff --git a/xmodule/modulestore/split_mongo/split.py b/xmodule/modulestore/split_mongo/split.py
index 429a26561a76..d551fd8b4bf7 100644
--- a/xmodule/modulestore/split_mongo/split.py
+++ b/xmodule/modulestore/split_mongo/split.py
@@ -232,7 +232,7 @@ def _clear_bulk_ops_record(self, course_key):
course_key.replace(org=None, course=None, run=None, branch=None)
]
- def _start_outermost_bulk_operation(self, bulk_write_record, course_key, ignore_case=False): # lint-amnesty, pylint: disable=arguments-differ
+ def _start_outermost_bulk_operation(self, bulk_write_record, course_key, ignore_case=False): # pylint: disable=arguments-differ
"""
Begin a bulk write operation on course_key.
"""
@@ -241,7 +241,7 @@ def _start_outermost_bulk_operation(self, bulk_write_record, course_key, ignore_
bulk_write_record.index = copy.deepcopy(bulk_write_record.initial_index)
bulk_write_record.course_key = course_key
- def _end_outermost_bulk_operation(self, bulk_write_record, structure_key): # lint-amnesty, pylint: disable=arguments-differ
+ def _end_outermost_bulk_operation(self, bulk_write_record, structure_key): # pylint: disable=arguments-differ
"""
End the active bulk write operation on structure_key (course or library key).
"""
@@ -996,7 +996,7 @@ def extract_course_summary(course):
if len(course_block) > 1:
raise MultipleCourseBlocksFound(
- "Expected 1 course block to be found in the course, but found {}".format(len(course_block)) # noqa: UP032 # pylint: disable=line-too-long
+ "Expected 1 course block to be found in the course, but found {}".format(len(course_block)) # noqa: UP032
)
course_summary = extract_course_summary(course_block[0])
courses_summaries.append(
@@ -1118,7 +1118,7 @@ def has_course(self, course_id, ignore_case=False, **kwargs):
return False
course_index = self.get_course_index(course_id, ignore_case)
- return CourseLocator(course_index['org'], course_index['course'], course_index['run'], course_id.branch) if course_index else None # lint-amnesty, pylint: disable=line-too-long
+ return CourseLocator(course_index['org'], course_index['course'], course_index['run'], course_id.branch) if course_index else None # noqa: E501
def has_library(self, library_id, ignore_case=False, **kwargs): # lint-amnesty, pylint: disable=unused-argument
"""
@@ -1177,7 +1177,7 @@ def get_item(self, usage_key, depth=0, **kwargs): # lint-amnesty, pylint: disab
log.debug(f"Found more than one item for '{usage_key}'")
return items[0]
- def get_items(self, course_locator, settings=None, content=None, qualifiers=None, include_orphans=True, **kwargs): # lint-amnesty, pylint: disable=arguments-differ
+ def get_items(self, course_locator, settings=None, content=None, qualifiers=None, include_orphans=True, **kwargs): # pylint: disable=arguments-differ
"""
Returns:
list of XModuleDescriptor instances for the matching items within the course with
@@ -1566,7 +1566,7 @@ def _generate_block_key(self, course_blocks, category):
return potential_key
serial += 1
- def create_item(self, user_id, course_key, block_type, block_id=None, definition_locator=None, fields=None, # lint-amnesty, pylint: disable=arguments-differ
+ def create_item(self, user_id, course_key, block_type, block_id=None, definition_locator=None, fields=None, # pylint: disable=arguments-differ
asides=None, force=False, **kwargs):
"""
Add a block to persistence as an element
@@ -1604,12 +1604,12 @@ def create_item(self, user_id, course_key, block_type, block_id=None, definition
specify version_guid or the one it specifies == the current head of the branch,
it progresses the course to point
to the new head and sets the active version to point to the new head
- * If the locator has a org and course and run but its version_guid != current head, it raises VersionConflictError. # lint-amnesty, pylint: disable=line-too-long
+ * If the locator has a org and course and run but its version_guid != current head, it raises VersionConflictError.
NOTE: using a version_guid will end up creating a new version of the course. Your new item won't be in
the course id'd by version_guid but instead in one w/ a new version_guid. Ensure in this case that you get
the new version_guid from the locator in the returned object!
- """
+ """ # noqa: E501
with self.bulk_operations(course_key):
# split handles all the fields in one dict not separated by scope
fields = fields or {}
@@ -1630,7 +1630,7 @@ def create_item(self, user_id, course_key, block_type, block_id=None, definition
if definition_locator is None or isinstance(definition_locator.definition_id, LocalId):
definition_locator = self.create_definition_from_data(course_key, new_def_data, block_type, user_id)
elif new_def_data:
- definition_locator, _ = self.update_definition_from_data(course_key, definition_locator, new_def_data, user_id) # lint-amnesty, pylint: disable=line-too-long
+ definition_locator, _ = self.update_definition_from_data(course_key, definition_locator, new_def_data, user_id) # noqa: E501
# copy the structure and modify the new one
new_structure = self.version_structure(course_key, structure, user_id)
@@ -1683,7 +1683,7 @@ def create_item(self, user_id, course_key, block_type, block_id=None, definition
# reconstruct the new_item from the cache
return self.get_item(item_loc)
- def create_child(self, user_id, parent_usage_key, block_type, block_id=None, fields=None, asides=None, **kwargs): # lint-amnesty, pylint: disable=arguments-differ
+ def create_child(self, user_id, parent_usage_key, block_type, block_id=None, fields=None, asides=None, **kwargs): # pylint: disable=arguments-differ
"""
Creates and saves a new xblock that as a child of the specified block
@@ -1847,7 +1847,7 @@ def _create_courselike( # lint-amnesty, pylint: disable=too-many-statements
# if building a wholly new structure
if versions_dict is None or master_branch not in versions_dict:
# create new definition and structure
- definition_id = self.create_definition_from_data(locator, definition_fields, root_category, user_id).definition_id # lint-amnesty, pylint: disable=line-too-long
+ definition_id = self.create_definition_from_data(locator, definition_fields, root_category, user_id).definition_id # noqa: E501
draft_structure = self._new_structure(
user_id,
@@ -1927,14 +1927,14 @@ def create_library(self, org, library, user_id, fields, **kwargs):
locator = LibraryLocator(org=org, library=library, branch=kwargs["master_branch"])
return self._create_courselike(locator, user_id, **kwargs)
- def update_item(self, block, user_id, allow_not_found=False, force=False, **kwargs): # lint-amnesty, pylint: disable=arguments-differ
+ def update_item(self, block, user_id, allow_not_found=False, force=False, **kwargs): # pylint: disable=arguments-differ
"""
Save the block's fields. it doesn't descend the course dag to save the children.
Return the new block (updated location).
raises ItemNotFoundError if the location does not exist.
- Creates a new course version. If the block's location has a org and course and run, it moves the course head # lint-amnesty, pylint: disable=line-too-long
+ Creates a new course version. If the block's location has a org and course and run, it moves the course head
pointer. If the version_guid of the block points to a non-head version and there's been an intervening
change to this item, it raises a VersionConflictError unless force is True. In the force case, it forks
the course but leaves the head pointer where it is (this change will not be in the course head).
@@ -1997,7 +1997,7 @@ def _update_item_from_fields(self, user_id, course_key, block_key, partitioned_f
# check children
if partitioned_fields.get(Scope.children, {}): # purposely not 'is not None'
- serialized_children = [BlockKey.from_usage_key(child) for child in partitioned_fields[Scope.children]['children']] # lint-amnesty, pylint: disable=line-too-long
+ serialized_children = [BlockKey.from_usage_key(child) for child in partitioned_fields[Scope.children]['children']] # noqa: E501
is_updated = is_updated or original_entry.fields.get('children', []) != serialized_children
if is_updated:
settings['children'] = serialized_children
@@ -2151,7 +2151,7 @@ def persist_xblock_dag(self, xblock, user_id, force=False):
else:
return xblock
- def _persist_subdag(self, course_key, xblock, user_id, structure_blocks, new_id): # lint-amnesty, pylint: disable=missing-function-docstring
+ def _persist_subdag(self, course_key, xblock, user_id, structure_blocks, new_id): # pylint: disable=missing-function-docstring
# persist the definition if persisted != passed
partitioned_fields = self.partition_xblock_fields_by_scope(xblock)
new_def_data = self._serialize_fields(xblock.category, partitioned_fields[Scope.content])
@@ -2187,7 +2187,7 @@ def _persist_subdag(self, course_key, xblock, user_id, structure_blocks, new_id)
for child in xblock.children:
if isinstance(child.block_id, LocalId):
child_block = xblock.runtime.get_block(child)
- is_updated = self._persist_subdag(course_key, child_block, user_id, structure_blocks, new_id) or is_updated # lint-amnesty, pylint: disable=line-too-long
+ is_updated = self._persist_subdag(course_key, child_block, user_id, structure_blocks, new_id) or is_updated # noqa: E501
children.append(BlockKey.from_usage_key(child_block.location))
else:
children.append(BlockKey.from_usage_key(child))
@@ -2508,7 +2508,7 @@ def delete_item(self, usage_locator, user_id, force=False): # lint-amnesty, pyl
raises ItemNotFoundError if the location does not exist.
raises ValueError if usage_locator points to the structure root
- Creates a new course version. If the block's location has a org, a course, and a run, it moves the course head # lint-amnesty, pylint: disable=line-too-long
+ Creates a new course version. If the block's location has a org, a course, and a run, it moves the course head
pointer. If the version_guid of the block points to a non-head version and there's been an intervening
change to this item, it raises a VersionConflictError unless force is True. In the force case, it forks
the course but leaves the head pointer where it is (this change will not be in the course head).
@@ -2670,7 +2670,7 @@ def inherit_settings(
for child in block_fields.get('children', []):
try:
if child in inherited_from:
- raise Exception(f'Infinite loop detected when inheriting to {child}, having already inherited from {inherited_from}') # lint-amnesty, pylint: disable=line-too-long
+ raise Exception(f'Infinite loop detected when inheriting to {child}, having already inherited from {inherited_from}') # noqa: E501
self.inherit_settings(
block_map,
BlockKey(*child),
@@ -2719,7 +2719,7 @@ def _find_course_assets(self, course_key):
"""
try:
course_assets = self._lookup_course(course_key).structure.get('assets', {})
- except (InsufficientSpecificationError, VersionConflictError) as err: # lint-amnesty, pylint: disable=unused-variable # noqa: F841
+ except (InsufficientSpecificationError, VersionConflictError) as err: # pylint: disable=unused-variable # noqa: F841
log.warning('Error finding assets for org "%s" course "%s" on asset '
'request. Either version of course_key is None or invalid.',
course_key.org, course_key.course)
@@ -2894,7 +2894,7 @@ def fix_not_found(self, course_locator, user_id):
# update the index entry if appropriate
self._update_head(course_locator, index_entry, course_locator.branch, new_structure['_id'])
- def convert_references_to_keys(self, course_key, xblock_class, jsonfields, blocks): # lint-amnesty, pylint: disable=unused-argument
+ def convert_references_to_keys(self, course_key, xblock_class, jsonfields, blocks): # pylint: disable=unused-argument
"""
Convert the given serialized fields to the deserialized values by finding all references
and converting them.
@@ -2969,7 +2969,7 @@ def _get_index_if_valid(self, course_key, force=False):
index_entry['versions'][course_key.branch]
)
- def _find_local_root(self, element_to_find, possibility, tree): # lint-amnesty, pylint: disable=missing-function-docstring
+ def _find_local_root(self, element_to_find, possibility, tree): # pylint: disable=missing-function-docstring
if possibility not in tree:
return False
if element_to_find in tree[possibility]:
diff --git a/xmodule/modulestore/split_mongo/split_draft.py b/xmodule/modulestore/split_mongo/split_draft.py
index 25320e6bd62f..57a064a9a65f 100644
--- a/xmodule/modulestore/split_mongo/split_draft.py
+++ b/xmodule/modulestore/split_mongo/split_draft.py
@@ -21,7 +21,7 @@ class DraftVersioningModuleStore(SplitMongoModuleStore, ModuleStoreDraftAndPubli
A subclass of Split that supports a dual-branch fall-back versioning framework
with a Draft branch that falls back to a Published branch.
"""
- def create_course(self, org, course, run, user_id, skip_auto_publish=False, **kwargs): # lint-amnesty, pylint: disable=arguments-differ
+ def create_course(self, org, course, run, user_id, skip_auto_publish=False, **kwargs): # pylint: disable=arguments-differ
"""
Creates and returns the course.
@@ -68,7 +68,7 @@ def get_library(self, library_id, depth=0, head_validation=True, **kwargs):
library_id = self._map_revision_to_branch(library_id)
return super().get_library(library_id, depth=depth, **kwargs)
- def clone_course(self, source_course_id, dest_course_id, user_id, fields=None, revision=None, **kwargs): # lint-amnesty, pylint: disable=arguments-differ
+ def clone_course(self, source_course_id, dest_course_id, user_id, fields=None, revision=None, **kwargs): # pylint: disable=arguments-differ
"""
See :py:meth: xmodule.modulestore.split_mongo.split.SplitMongoModuleStore.clone_course
"""
@@ -116,7 +116,7 @@ def _auto_publish_no_children(self, location, category, user_id, **kwargs):
# version_agnostic b/c of above assumption in docstring
self.publish(location.version_agnostic(), user_id, blacklist=EXCLUDE_ALL, **kwargs)
- def copy_from_template(self, source_keys, dest_key, user_id, **kwargs): # lint-amnesty, pylint: disable=arguments-differ
+ def copy_from_template(self, source_keys, dest_key, user_id, **kwargs): # pylint: disable=arguments-differ
"""
See :py:meth `SplitMongoModuleStore.copy_from_template`
"""
@@ -140,7 +140,7 @@ def copy_from_template(self, source_keys, dest_key, user_id, **kwargs): # lint-
keys_to_check.extend(children)
return new_keys
- def update_item(self, block, user_id, allow_not_found=False, force=False, asides=None, **kwargs): # lint-amnesty, pylint: disable=arguments-differ
+ def update_item(self, block, user_id, allow_not_found=False, force=False, asides=None, **kwargs): # pylint: disable=arguments-differ
old_block_locn = block.location
block.location = self._map_revision_to_branch(old_block_locn)
emit_signals = block.location.branch == ModuleStoreEnum.BranchName.published \
@@ -192,7 +192,7 @@ def create_child(
self._auto_publish_no_children(parent_usage_key, item.location.block_type, user_id, **kwargs)
return item
- def delete_item(self, location, user_id, revision=None, skip_auto_publish=False, **kwargs): # lint-amnesty, pylint: disable=arguments-differ
+ def delete_item(self, location, user_id, revision=None, skip_auto_publish=False, **kwargs): # pylint: disable=arguments-differ
"""
Delete the given item from persistence. kwargs allow modulestore specific parameters.
@@ -217,7 +217,7 @@ def delete_item(self, location, user_id, revision=None, skip_auto_publish=False,
autopublish_parent = False
with self.bulk_operations(location.course_key):
if isinstance(location, LibraryUsageLocator):
- branches_to_delete = [ModuleStoreEnum.BranchName.library] # Libraries don't yet have draft/publish support # lint-amnesty, pylint: disable=line-too-long
+ branches_to_delete = [ModuleStoreEnum.BranchName.library] # Libraries don't yet have draft/publish support # noqa: E501
elif location.block_type in DIRECT_ONLY_CATEGORIES:
branches_to_delete = [ModuleStoreEnum.BranchName.published, ModuleStoreEnum.BranchName.draft]
elif revision == ModuleStoreEnum.RevisionOption.all:
@@ -491,7 +491,7 @@ def update_parent_if_moved(self, item_location, original_parent_location, course
old_parent_location = original_parent_location.course_key.make_usage_key(block_key.type, block_key.id)
self.update_item_parent(item_location, original_parent_location, old_parent_location, user_id)
- def force_publish_course(self, course_locator, user_id, commit=False): # lint-amnesty, pylint: disable=unused-argument
+ def force_publish_course(self, course_locator, user_id, commit=False): # pylint: disable=unused-argument
"""
Helper method to forcefully publish a course,
making the published branch point to the same structure as the draft branch.
@@ -575,7 +575,7 @@ def import_xblock(self, user_id, course_key, block_type, block_id, fields=None,
# Importing the block and publishing the block links the draft & published blocks' version history.
draft_block = self.import_xblock(user_id, draft_course, block_type, block_id, fields,
runtime, **kwargs)
- return self.publish(draft_block.location.version_agnostic(), user_id, blacklist=EXCLUDE_ALL, **kwargs) # lint-amnesty, pylint: disable=line-too-long
+ return self.publish(draft_block.location.version_agnostic(), user_id, blacklist=EXCLUDE_ALL, **kwargs) # noqa: E501
# do the import
partitioned_fields = self.partition_fields_by_scope(block_type, fields)
diff --git a/xmodule/modulestore/store_utilities.py b/xmodule/modulestore/store_utilities.py
index ee80ee31acc0..faefad972b53 100644
--- a/xmodule/modulestore/store_utilities.py
+++ b/xmodule/modulestore/store_utilities.py
@@ -48,7 +48,7 @@ def portable_jump_to_link_substitution(match):
try:
text = _prefix_only_url_replace_regex(asset_block_pattern).sub(portable_asset_link_subtitution, text)
except Exception as exc: # pylint: disable=broad-except
- logging.warning("Error producing regex substitution %r for text = %r.\n\nError msg = %s", asset_block_pattern, text, str(exc)) # lint-amnesty, pylint: disable=line-too-long
+ logging.warning("Error producing regex substitution %r for text = %r.\n\nError msg = %s", asset_block_pattern, text, str(exc)) # noqa: E501
placeholder_category = f'cat_{uuid.uuid4().hex}'
usage_block_pattern = str(source_course_id.make_usage_key(placeholder_category, placeholder_id))
@@ -60,7 +60,7 @@ def portable_jump_to_link_substitution(match):
try:
text = _prefix_only_url_replace_regex(jump_to_link_base).sub(portable_jump_to_link_substitution, text)
except Exception as exc: # pylint: disable=broad-except
- logging.warning("Error producing regex substitution %r for text = %r.\n\nError msg = %s", jump_to_link_base, text, str(exc)) # lint-amnesty, pylint: disable=line-too-long
+ logging.warning("Error producing regex substitution %r for text = %r.\n\nError msg = %s", jump_to_link_base, text, str(exc)) # noqa: E501
# Also, there commonly is a set of link URL's used in the format:
# /courses/// which will be broken if migrated to a different course_id
@@ -71,9 +71,9 @@ def portable_jump_to_link_substitution(match):
if source_course_id != dest_course_id:
try:
generic_courseware_link_base = f'/courses/{str(source_course_id)}/'
- text = re.sub(_prefix_only_url_replace_regex(generic_courseware_link_base), portable_asset_link_subtitution, text) # lint-amnesty, pylint: disable=line-too-long
+ text = re.sub(_prefix_only_url_replace_regex(generic_courseware_link_base), portable_asset_link_subtitution, text) # noqa: E501
except Exception as exc: # pylint: disable=broad-except
- logging.warning("Error producing regex substitution %r for text = %r.\n\nError msg = %s", source_course_id, text, str(exc)) # lint-amnesty, pylint: disable=line-too-long
+ logging.warning("Error producing regex substitution %r for text = %r.\n\nError msg = %s", source_course_id, text, str(exc)) # noqa: E501
return text
diff --git a/xmodule/modulestore/tests/django_utils.py b/xmodule/modulestore/tests/django_utils.py
index 0c8f4196f150..270e49e45257 100644
--- a/xmodule/modulestore/tests/django_utils.py
+++ b/xmodule/modulestore/tests/django_utils.py
@@ -256,7 +256,7 @@ def enable_signals_by_name(cls, *signal_names):
"You tried to enable signal '{}', but I don't recognize that "
"signal name. Did you mean one of these?: {}"
)
- raise ValueError(err_msg.format(signal_name, all_signal_names)) # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904
+ raise ValueError(err_msg.format(signal_name, all_signal_names)) # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904, E501
signal.enable()
diff --git a/xmodule/modulestore/tests/factories.py b/xmodule/modulestore/tests/factories.py
index 546a8de86631..7ec3c1307b5d 100644
--- a/xmodule/modulestore/tests/factories.py
+++ b/xmodule/modulestore/tests/factories.py
@@ -332,7 +332,7 @@ def parent_location(self): # lint-amnesty, pylint: disable=missing-function-doc
@classmethod
@strip_key
- def _create(cls, target_class, **kwargs): # lint-amnesty, pylint: disable=arguments-differ, too-many-statements, unused-argument
+ def _create(cls, target_class, **kwargs): # pylint: disable=arguments-differ, too-many-statements, unused-argument
"""
Uses ``**kwargs``:
diff --git a/xmodule/modulestore/tests/sample_courses.py b/xmodule/modulestore/tests/sample_courses.py
index 04a56b82e1ad..aa01278a83fd 100644
--- a/xmodule/modulestore/tests/sample_courses.py
+++ b/xmodule/modulestore/tests/sample_courses.py
@@ -50,7 +50,7 @@
'Overview', "chapter", {"display_name": "Overview"}, [
BlockInfo(
"Toy_Videos", "sequential", {
- "xml_attributes": {"filename": ["", None]}, "display_name": "Toy Videos", "format": "Lecture Sequence" # lint-amnesty, pylint: disable=line-too-long
+ "xml_attributes": {"filename": ["", None]}, "display_name": "Toy Videos", "format": "Lecture Sequence" # noqa: E501
}, [
BlockInfo(
"secret:toylab", "html", {
@@ -66,7 +66,7 @@
),
BlockInfo(
"toyjumpto", "html", {
- "data": "This is a link to another page and some Chinese 四節比分和七年前 Some more Chinese 四節比分和七年前
\n", # lint-amnesty, pylint: disable=line-too-long
+ "data": "This is a link to another page and some Chinese 四節比分和七年前 Some more Chinese 四節比分和七年前
\n", # noqa: E501
"xml_attributes": {"filename": ["html/toyjumpto.xml", "html/toyjumpto.xml"]}
}, []),
BlockInfo(
@@ -91,7 +91,7 @@
}, []),
BlockInfo(
"with_styling", "html", {
- "data": "Red text here
", # lint-amnesty, pylint: disable=line-too-long
+ "data": "Red text here
", # noqa: E501
"xml_attributes": {"filename": ["html/with_styling.xml", "html/with_styling.xml"]}
}, []),
BlockInfo(
@@ -108,7 +108,7 @@
"Welcome", "video", {"data": "", "youtube_id_1_0": "p2Q6BrNhdh8", "display_name": "Welcome"}, []
),
BlockInfo(
- "video_123456789012", "video", {"data": "", "youtube_id_1_0": "p2Q6BrNhdh8", "display_name": "Test Video"}, [] # lint-amnesty, pylint: disable=line-too-long
+ "video_123456789012", "video", {"data": "", "youtube_id_1_0": "p2Q6BrNhdh8", "display_name": "Test Video"}, [] # noqa: E501
),
BlockInfo(
"video_4f66f493ac8f", "video", {"youtube_id_1_0": "p2Q6BrNhdh8"}, []
diff --git a/xmodule/modulestore/tests/test_assetstore.py b/xmodule/modulestore/tests/test_assetstore.py
index c336bb3109d9..f2310e1f909c 100644
--- a/xmodule/modulestore/tests/test_assetstore.py
+++ b/xmodule/modulestore/tests/test_assetstore.py
@@ -66,7 +66,7 @@ class TestSortedAssetList(unittest.TestCase):
def setUp(self):
super().setUp()
- asset_list = [dict(list(zip(AssetStoreTestData.asset_fields, asset))) for asset in AssetStoreTestData.all_asset_data] # lint-amnesty, pylint: disable=line-too-long # noqa: B905
+ asset_list = [dict(list(zip(AssetStoreTestData.asset_fields, asset))) for asset in AssetStoreTestData.all_asset_data] # noqa: B905, E501
self.sorted_asset_list_by_filename = SortedAssetList(iterable=asset_list)
self.sorted_asset_list_by_last_edit = SortedAssetList(iterable=asset_list, key=lambda x: x['edited_on'])
self.course_key = CourseLocator('org', 'course', 'run')
diff --git a/xmodule/modulestore/tests/test_contentstore.py b/xmodule/modulestore/tests/test_contentstore.py
index c7874f900d32..afca933353fd 100644
--- a/xmodule/modulestore/tests/test_contentstore.py
+++ b/xmodule/modulestore/tests/test_contentstore.py
@@ -60,17 +60,17 @@ def set_up_assets(self, deprecated):
"""
# since MongoModuleStore and MongoContentStore are basically assumed to be together, create this class
# as well
- self.contentstore = MongoContentStore(HOST, DB, port=PORT) # lint-amnesty, pylint: disable=attribute-defined-outside-init
+ self.contentstore = MongoContentStore(HOST, DB, port=PORT) # pylint: disable=attribute-defined-outside-init
self.addCleanup(self.contentstore._drop_database) # pylint: disable=protected-access
AssetLocator.deprecated = deprecated
CourseLocator.deprecated = deprecated
- self.course1_key = CourseLocator('test', 'asset_test', '2014_07') # lint-amnesty, pylint: disable=attribute-defined-outside-init
- self.course2_key = CourseLocator('test', 'asset_test2', '2014_07') # lint-amnesty, pylint: disable=attribute-defined-outside-init
+ self.course1_key = CourseLocator('test', 'asset_test', '2014_07') # pylint: disable=attribute-defined-outside-init
+ self.course2_key = CourseLocator('test', 'asset_test2', '2014_07') # pylint: disable=attribute-defined-outside-init
- self.course1_files = ['contains.sh', 'picture1.jpg', 'picture2.jpg'] # lint-amnesty, pylint: disable=attribute-defined-outside-init
- self.course2_files = ['picture1.jpg', 'picture3.jpg', 'door_2.ogg'] # lint-amnesty, pylint: disable=attribute-defined-outside-init
+ self.course1_files = ['contains.sh', 'picture1.jpg', 'picture2.jpg'] # pylint: disable=attribute-defined-outside-init
+ self.course2_files = ['picture1.jpg', 'picture3.jpg', 'door_2.ogg'] # pylint: disable=attribute-defined-outside-init
def load_assets(course_key, files):
locked = False
diff --git a/xmodule/modulestore/tests/test_cross_modulestore_import_export.py b/xmodule/modulestore/tests/test_cross_modulestore_import_export.py
index 01b64275524b..e70057b447a9 100644
--- a/xmodule/modulestore/tests/test_cross_modulestore_import_export.py
+++ b/xmodule/modulestore/tests/test_cross_modulestore_import_export.py
@@ -162,8 +162,8 @@ def test_split_course_export_import(self):
with MongoContentstoreBuilder().build() as dest_content:
# Construct the modulestore for storing the second import (using the second contentstore)
with SPLIT_MODULESTORE_SETUP.build(contentstore=dest_content) as dest_store:
- source_course_key = source_store.make_course_key('a', 'source', '2015_Fall') # lint-amnesty, pylint: disable=no-member
- dest_course_key = dest_store.make_course_key('a', 'dest', '2015_Fall') # lint-amnesty, pylint: disable=no-member
+ source_course_key = source_store.make_course_key('a', 'source', '2015_Fall') # pylint: disable=no-member
+ dest_course_key = dest_store.make_course_key('a', 'dest', '2015_Fall') # pylint: disable=no-member
import_course_from_xml(
source_store,
@@ -184,7 +184,7 @@ def test_split_course_export_import(self):
EXPORTED_COURSE_DIR_NAME,
)
- source_course = source_store.get_course(source_course_key, depth=None, lazy=False) # lint-amnesty, pylint: disable=no-member
+ source_course = source_store.get_course(source_course_key, depth=None, lazy=False) # pylint: disable=no-member
assert source_course.url_name == 'course'
@@ -204,6 +204,6 @@ def test_split_course_export_import(self):
create_if_not_present=True,
)
- dest_course = dest_store.get_course(dest_course_key, depth=None, lazy=False) # lint-amnesty, pylint: disable=no-member
+ dest_course = dest_store.get_course(dest_course_key, depth=None, lazy=False) # pylint: disable=no-member
assert dest_course.url_name == 'course'
diff --git a/xmodule/modulestore/tests/test_mixed_modulestore.py b/xmodule/modulestore/tests/test_mixed_modulestore.py
index b96581db2f74..a847b2dc4fa5 100644
--- a/xmodule/modulestore/tests/test_mixed_modulestore.py
+++ b/xmodule/modulestore/tests/test_mixed_modulestore.py
@@ -219,7 +219,7 @@ def _create_course(self, course_key, asides=None):
"""
# create course
with self.store.bulk_operations(course_key):
- self.course = self.store.create_course(course_key.org, course_key.course, course_key.run, self.user_id) # lint-amnesty, pylint: disable=attribute-defined-outside-init
+ self.course = self.store.create_course(course_key.org, course_key.course, course_key.run, self.user_id) # pylint: disable=attribute-defined-outside-init
if isinstance(self.course.id, CourseLocator):
self.course_locations[self.MONGO_COURSEID] = self.course.location
else:
@@ -399,9 +399,9 @@ def test_get_modulestore_cache(self, default_ms):
self.store.mappings = {}
course_key = self.course_locations[self.MONGO_COURSEID].course_key
with check_exact_number_of_calls(self.store.default_modulestore, 'has_course', 1):
- assert self.store.default_modulestore == self.store._get_modulestore_for_courselike(course_key) # pylint: disable=protected-access, line-too-long
+ assert self.store.default_modulestore == self.store._get_modulestore_for_courselike(course_key) # pylint: disable=protected-access
assert course_key in self.store.mappings
- assert self.store.default_modulestore == self.store._get_modulestore_for_courselike(course_key) # pylint: disable=protected-access, line-too-long
+ assert self.store.default_modulestore == self.store._get_modulestore_for_courselike(course_key) # pylint: disable=protected-access
@ddt.data(*itertools.product(
(ModuleStoreEnum.Type.split,),
@@ -543,7 +543,7 @@ def test_get_items_include_orphans(self, default_ms, expected_items_in_tree, orp
items = self.store.get_items(course_key)
# Check items found are either course or about type
- assert {'course', 'about'}.issubset({item.location.block_type for item in items}) # pylint: disable=line-too-long
+ assert {'course', 'about'}.issubset({item.location.block_type for item in items})
# Assert that about is a detached category found in get_items
assert [item.location.block_type for item in items if item.location.block_type == 'about'][0]\
in DETACHED_XBLOCK_TYPES
@@ -1120,7 +1120,7 @@ def test_delete_item(self, default_ms, num_mysql, max_find, max_send):
Delete should reject on r/o db and work on r/w one
"""
self.initdb(default_ms)
- with self.store.branch_setting(ModuleStoreEnum.Branch.draft_preferred, self.writable_chapter_location.course_key): # lint-amnesty, pylint: disable=line-too-long
+ with self.store.branch_setting(ModuleStoreEnum.Branch.draft_preferred, self.writable_chapter_location.course_key): # noqa: E501
with check_mongo_calls(max_find, max_send), self.assertNumQueries(num_mysql):
self.store.delete_item(self.writable_chapter_location, self.user_id)
@@ -1320,7 +1320,7 @@ def verify_get_parent_locations_results(self, expected_results):
assert parent_location.for_branch(None) if parent_location else parent_location == \
self.store.get_parent_location(child_location, revision=revision)
- def verify_item_parent(self, item_location: BlockUsageLocator, expected_parent_location, old_parent_location, is_reverted=False): # pylint: disable=line-too-long
+ def verify_item_parent(self, item_location: BlockUsageLocator, expected_parent_location, old_parent_location, is_reverted=False): # noqa: E501
"""
Verifies that item is placed under expected parent.
@@ -1374,7 +1374,7 @@ def test_update_item_parent(self, store_type):
self._create_block_hierarchy()
# Publish the course.
- self.course = self.store.publish(self.course.location, self.user_id) # lint-amnesty, pylint: disable=attribute-defined-outside-init
+ self.course = self.store.publish(self.course.location, self.user_id) # pylint: disable=attribute-defined-outside-init
# Move child problem_x1a_1 to vertical_y1a.
item_location = self.problem_x1a_1 # lint-amnesty, pylint: disable=no-member
@@ -1401,7 +1401,7 @@ def test_move_revert(self, store_type):
self._create_block_hierarchy()
# Publish the course
- self.course = self.store.publish(self.course.location, self.user_id) # lint-amnesty, pylint: disable=attribute-defined-outside-init
+ self.course = self.store.publish(self.course.location, self.user_id) # pylint: disable=attribute-defined-outside-init
# Move child problem_x1a_1 to vertical_y1a.
item_location = self.problem_x1a_1 # lint-amnesty, pylint: disable=no-member
@@ -1438,7 +1438,7 @@ def test_move_delete_revert(self, store_type):
self._create_block_hierarchy()
# Publish the course
- self.course = self.store.publish(self.course.location, self.user_id) # lint-amnesty, pylint: disable=attribute-defined-outside-init
+ self.course = self.store.publish(self.course.location, self.user_id) # pylint: disable=attribute-defined-outside-init
# Move child problem_x1a_1 to vertical_y1a.
item_location = self.problem_x1a_1 # lint-amnesty, pylint: disable=no-member
@@ -1479,7 +1479,7 @@ def test_move_revert_move(self, store_type):
self._create_block_hierarchy()
# Publish the course
- self.course = self.store.publish(self.course.location, self.user_id) # lint-amnesty, pylint: disable=attribute-defined-outside-init
+ self.course = self.store.publish(self.course.location, self.user_id) # pylint: disable=attribute-defined-outside-init
# Move child problem_x1a_1 to vertical_y1a.
item_location = self.problem_x1a_1 # lint-amnesty, pylint: disable=no-member
@@ -1528,7 +1528,7 @@ def test_move_edited_revert(self, store_type):
self._create_block_hierarchy()
# Publish the course.
- self.course = self.store.publish(self.course.location, self.user_id) # lint-amnesty, pylint: disable=attribute-defined-outside-init
+ self.course = self.store.publish(self.course.location, self.user_id) # pylint: disable=attribute-defined-outside-init
# Move child problem_x1a_1 to vertical_y1a.
item_location = self.problem_x1a_1 # lint-amnesty, pylint: disable=no-member
@@ -1574,10 +1574,10 @@ def test_move_1_moved_1_unchanged(self, store_type):
self._create_block_hierarchy()
# Create some children in vertical_x1a
- problem_item2 = self.store.create_child(self.user_id, self.vertical_x1a, 'problem', 'Problem_Item2') # lint-amnesty, pylint: disable=no-member
+ problem_item2 = self.store.create_child(self.user_id, self.vertical_x1a, 'problem', 'Problem_Item2') # pylint: disable=no-member
# Publish the course.
- self.course = self.store.publish(self.course.location, self.user_id) # lint-amnesty, pylint: disable=attribute-defined-outside-init
+ self.course = self.store.publish(self.course.location, self.user_id) # pylint: disable=attribute-defined-outside-init
item_location = self.problem_x1a_1 # lint-amnesty, pylint: disable=no-member
new_parent_location = self.vertical_y1a # lint-amnesty, pylint: disable=no-member
@@ -1611,11 +1611,11 @@ def test_move_1_moved_1_edited(self, store_type):
self._create_block_hierarchy()
# Create some children in vertical_x1a
- problem_item2 = self.store.create_child(self.user_id, self.vertical_x1a, 'problem', 'Problem_Item2') # lint-amnesty, pylint: disable=no-member
+ problem_item2 = self.store.create_child(self.user_id, self.vertical_x1a, 'problem', 'Problem_Item2') # pylint: disable=no-member
orig_display_name = problem_item2.display_name
# Publish the course.
- self.course = self.store.publish(self.course.location, self.user_id) # lint-amnesty, pylint: disable=attribute-defined-outside-init
+ self.course = self.store.publish(self.course.location, self.user_id) # pylint: disable=attribute-defined-outside-init
# Edit problem_item2.
problem_item2.display_name = 'updated'
@@ -1658,11 +1658,11 @@ def test_move_1_moved_1_deleted(self, store_type):
self._create_block_hierarchy()
# Create some children in vertical_x1a
- problem_item2 = self.store.create_child(self.user_id, self.vertical_x1a, 'problem', 'Problem_Item2') # lint-amnesty, pylint: disable=no-member
+ problem_item2 = self.store.create_child(self.user_id, self.vertical_x1a, 'problem', 'Problem_Item2') # pylint: disable=no-member
orig_display_name = problem_item2.display_name # lint-amnesty, pylint: disable=unused-variable # noqa: F841
# Publish the course.
- self.course = self.store.publish(self.course.location, self.user_id) # lint-amnesty, pylint: disable=attribute-defined-outside-init
+ self.course = self.store.publish(self.course.location, self.user_id) # pylint: disable=attribute-defined-outside-init
# Now delete other problem problem_item2.
self.store.delete_item(problem_item2.location, self.user_id)
@@ -1698,7 +1698,7 @@ def test_get_parent_locations_moved_child(self, default_ms):
self._create_block_hierarchy()
# publish the course
- self.course = self.store.publish(self.course.location, self.user_id) # lint-amnesty, pylint: disable=attribute-defined-outside-init
+ self.course = self.store.publish(self.course.location, self.user_id) # pylint: disable=attribute-defined-outside-init
with self.store.bulk_operations(self.course.id):
# make drafts of verticals
@@ -1758,9 +1758,9 @@ def test_path_to_location(self, default_ms, num_mysql, num_finds, num_sends):
should_work = (
(self.problem_x1a_2, # lint-amnesty, pylint: disable=no-member
- (course_key, "Chapter_x", "Sequential_x1", 'Vertical_x1a', '1', self.problem_x1a_2)), # lint-amnesty, pylint: disable=no-member
+ (course_key, "Chapter_x", "Sequential_x1", 'Vertical_x1a', '1', self.problem_x1a_2)), # pylint: disable=no-member
(self.chapter_x, # lint-amnesty, pylint: disable=no-member
- (course_key, "Chapter_x", None, None, None, self.chapter_x)), # lint-amnesty, pylint: disable=no-member
+ (course_key, "Chapter_x", None, None, None, self.chapter_x)), # pylint: disable=no-member
)
for location, expected in should_work:
@@ -2114,7 +2114,7 @@ def test_has_published_version(self, default_ms, mysql_queries, max_find, max_se
self._create_block_hierarchy()
# start off as Private
- item = self.store.create_child(self.user_id, self.writable_chapter_location, 'problem', 'test_compute_publish_state') # lint-amnesty, pylint: disable=line-too-long
+ item = self.store.create_child(self.user_id, self.writable_chapter_location, 'problem', 'test_compute_publish_state') # noqa: E501
item_location = item.location
with self.assertNumQueries(mysql_queries), check_mongo_calls(max_find, max_send):
assert not self.store.has_published_version(item)
diff --git a/xmodule/modulestore/tests/test_modulestore.py b/xmodule/modulestore/tests/test_modulestore.py
index bd197b43086b..299d66c7cbec 100644
--- a/xmodule/modulestore/tests/test_modulestore.py
+++ b/xmodule/modulestore/tests/test_modulestore.py
@@ -5,7 +5,7 @@
"""
-def check_has_course_method(modulestore, locator, locator_key_fields): # lint-amnesty, pylint: disable=missing-function-docstring
+def check_has_course_method(modulestore, locator, locator_key_fields): # pylint: disable=missing-function-docstring
error_message = "Called has_course with query {0} and ignore_case is {1}."
for ignore_case in [True, False]:
diff --git a/xmodule/modulestore/tests/test_modulestore_settings.py b/xmodule/modulestore/tests/test_modulestore_settings.py
index 0402b82c401f..2c2a289eb69a 100644
--- a/xmodule/modulestore/tests/test_modulestore_settings.py
+++ b/xmodule/modulestore/tests/test_modulestore_settings.py
@@ -198,7 +198,7 @@ def test_convert_from_dict_to_list(self):
def test_no_conversion(self):
# make sure there is no migration done on an already updated config
old_mixed_setting = self.ALREADY_UPDATED_MIXED_CONFIG
- new_mixed_setting, new_default_store_setting = self.assertMigrated(old_mixed_setting) # lint-amnesty, pylint: disable=unused-variable
+ new_mixed_setting, new_default_store_setting = self.assertMigrated(old_mixed_setting) # pylint: disable=unused-variable
assert self.is_split_configured(new_mixed_setting)
assert old_mixed_setting == new_mixed_setting
diff --git a/xmodule/modulestore/tests/test_split_modulestore.py b/xmodule/modulestore/tests/test_split_modulestore.py
index 5f96a05acb99..f80021f66faf 100644
--- a/xmodule/modulestore/tests/test_split_modulestore.py
+++ b/xmodule/modulestore/tests/test_split_modulestore.py
@@ -480,7 +480,7 @@ def bootstrapDB(split_store): # pylint: disable=invalid-name
elif spec['parent'] == course.location.block_id:
parent = course
else:
- block_usage = BlockUsageLocator.make_relative(course.location, spec['parent_type'], spec['parent']) # lint-amnesty, pylint: disable=line-too-long
+ block_usage = BlockUsageLocator.make_relative(course.location, spec['parent_type'], spec['parent']) # noqa: E501
parent = split_store.get_item(block_usage)
block_id = LocalId(spec['id'])
child = split_store.create_xblock(
@@ -693,9 +693,9 @@ def test_get_course_negative(self):
with pytest.raises(InsufficientSpecificationError):
modulestore().get_course(CourseLocator(org='edu', course='meh', run='blah'))
with pytest.raises(ItemNotFoundError):
- modulestore().get_course(CourseLocator(org='edu', course='nosuchthing', run="run", branch=BRANCH_NAME_DRAFT)) # lint-amnesty, pylint: disable=line-too-long
+ modulestore().get_course(CourseLocator(org='edu', course='nosuchthing', run="run", branch=BRANCH_NAME_DRAFT)) # noqa: E501
with pytest.raises(ItemNotFoundError):
- modulestore().get_course(CourseLocator(org='testx', course='GreekHero', run="run", branch=BRANCH_NAME_PUBLISHED)) # lint-amnesty, pylint: disable=line-too-long
+ modulestore().get_course(CourseLocator(org='testx', course='GreekHero', run="run", branch=BRANCH_NAME_PUBLISHED)) # noqa: E501
def test_cache(self):
"""
@@ -987,14 +987,14 @@ def test_get_non_root(self):
# in published course
locator = BlockUsageLocator(
- CourseLocator(org='testx', course='wonderful', run="run", branch=BRANCH_NAME_PUBLISHED), 'course', 'head23456' # lint-amnesty, pylint: disable=line-too-long
+ CourseLocator(org='testx', course='wonderful', run="run", branch=BRANCH_NAME_PUBLISHED), 'course', 'head23456' # noqa: E501
)
assert isinstance(modulestore().get_item(locator), CourseBlock)
# negative tests--not found
# no such course or block
locator = BlockUsageLocator(
- CourseLocator(org='doesnotexist', course='doesnotexist', run="run", branch=BRANCH_NAME_DRAFT), 'course', 'head23456' # lint-amnesty, pylint: disable=line-too-long
+ CourseLocator(org='doesnotexist', course='doesnotexist', run="run", branch=BRANCH_NAME_DRAFT), 'course', 'head23456' # noqa: E501
)
with pytest.raises(ItemNotFoundError):
modulestore().get_item(locator)
@@ -1286,7 +1286,7 @@ def test_create_bulk_operations(self):
user = random.getrandbits(32)
course_key = CourseLocator('test_org', 'test_transaction', 'test_run')
with modulestore().bulk_operations(course_key):
- new_course = modulestore().create_course('test_org', 'test_transaction', 'test_run', user, BRANCH_NAME_DRAFT) # lint-amnesty, pylint: disable=line-too-long
+ new_course = modulestore().create_course('test_org', 'test_transaction', 'test_run', user, BRANCH_NAME_DRAFT) # noqa: E501
new_course_locator = new_course.id
index_history_info = modulestore().get_course_history_info(new_course.location.course_key)
course_block_prev_version = new_course.previous_version
@@ -1836,12 +1836,12 @@ def test_inheritance_not_saved(self):
# set on parent, retrieve child, verify setting
chapter = modulestore().get_item(
BlockUsageLocator(
- CourseLocator(org='testx', course='GreekHero', run="run", branch=BRANCH_NAME_DRAFT), 'chapter', 'chapter3' # lint-amnesty, pylint: disable=line-too-long
+ CourseLocator(org='testx', course='GreekHero', run="run", branch=BRANCH_NAME_DRAFT), 'chapter', 'chapter3' # noqa: E501
)
)
problem = modulestore().get_item(
BlockUsageLocator(
- CourseLocator(org='testx', course='GreekHero', run="run", branch=BRANCH_NAME_DRAFT), 'problem', 'problem3_2' # lint-amnesty, pylint: disable=line-too-long
+ CourseLocator(org='testx', course='GreekHero', run="run", branch=BRANCH_NAME_DRAFT), 'problem', 'problem3_2' # noqa: E501
)
)
assert not problem.visible_to_staff_only
@@ -1869,13 +1869,13 @@ def test_dynamic_inheritance(self):
chapter.visible_to_staff_only = True
orphan_problem = modulestore().create_item(self.user_id, course_key, 'problem')
assert not orphan_problem.visible_to_staff_only
- parented_problem = modulestore().create_child(self.user_id, chapter.location.version_agnostic(), 'problem') # lint-amnesty, pylint: disable=unused-variable
+ parented_problem = modulestore().create_child(self.user_id, chapter.location.version_agnostic(), 'problem') # pylint: disable=unused-variable
# FIXME LMS-11376
# self.assertTrue(parented_problem.visible_to_staff_only)
orphan_problem = modulestore().create_xblock(chapter.runtime, course_key, 'problem')
assert not orphan_problem.visible_to_staff_only
- parented_problem = modulestore().create_xblock(chapter.runtime, course_key, 'problem', parent_xblock=chapter) # noqa: F841 # pylint: disable=line-too-long
+ parented_problem = modulestore().create_xblock(chapter.runtime, course_key, 'problem', parent_xblock=chapter) # noqa: F841
# FIXME LMS-11376
# self.assertTrue(parented_problem.visible_to_staff_only)
@@ -1982,7 +1982,7 @@ def test_move_delete(self):
BlockKey("chapter", "chapter3"),
BlockKey("problem", "problem1")
]
- self._check_course(source_course, dest_course, expected, [BlockKey("chapter", "chapter2"), BlockKey("problem", "problem3_2")]) # lint-amnesty, pylint: disable=line-too-long
+ self._check_course(source_course, dest_course, expected, [BlockKey("chapter", "chapter2"), BlockKey("problem", "problem3_2")]) # noqa: E501
def _check_course(self, source_course_loc, dest_course_loc, expected_blocks, unexpected_blocks):
"""
diff --git a/xmodule/modulestore/tests/test_split_modulestore_bulk_operations.py b/xmodule/modulestore/tests/test_split_modulestore_bulk_operations.py
index fef79a537906..241391d609c8 100644
--- a/xmodule/modulestore/tests/test_split_modulestore_bulk_operations.py
+++ b/xmodule/modulestore/tests/test_split_modulestore_bulk_operations.py
@@ -182,13 +182,13 @@ def test_write_index_and_definition_on_close(self):
self.bulk._begin_bulk_operation(self.course_key)
self.conn.reset_mock()
self.bulk.update_definition(self.course_key, self.definition)
- self.bulk.insert_course_index(self.course_key, {'versions': {self.course_key.branch: self.definition['_id']}}) # lint-amnesty, pylint: disable=no-member
+ self.bulk.insert_course_index(self.course_key, {'versions': {self.course_key.branch: self.definition['_id']}}) # pylint: disable=no-member
self.assertConnCalls()
self.bulk._end_bulk_operation(self.course_key)
self.assertConnCalls(
call.insert_definition(self.definition, self.course_key),
call.update_course_index(
- {'versions': {self.course_key.branch: self.definition['_id']}}, # lint-amnesty, pylint: disable=no-member
+ {'versions': {self.course_key.branch: self.definition['_id']}}, # pylint: disable=no-member
from_index=original_index,
course_context=self.course_key
)
@@ -202,7 +202,7 @@ def test_write_index_and_multiple_definitions_on_close(self):
self.bulk.update_definition(self.course_key.replace(branch='a'), self.definition)
other_definition = {'another': 'definition', '_id': ObjectId()}
self.bulk.update_definition(self.course_key.replace(branch='b'), other_definition)
- self.bulk.insert_course_index(self.course_key, {'versions': {'a': self.definition['_id'], 'b': other_definition['_id']}}) # lint-amnesty, pylint: disable=line-too-long
+ self.bulk.insert_course_index(self.course_key, {'versions': {'a': self.definition['_id'], 'b': other_definition['_id']}}) # noqa: E501
self.bulk._end_bulk_operation(self.course_key)
self.assertCountEqual( # noqa: PT009
[
@@ -249,13 +249,13 @@ def test_write_index_and_structure_on_close(self):
self.bulk._begin_bulk_operation(self.course_key)
self.conn.reset_mock()
self.bulk.update_structure(self.course_key, self.structure)
- self.bulk.insert_course_index(self.course_key, {'versions': {self.course_key.branch: self.structure['_id']}}) # lint-amnesty, pylint: disable=no-member
+ self.bulk.insert_course_index(self.course_key, {'versions': {self.course_key.branch: self.structure['_id']}}) # pylint: disable=no-member
self.assertConnCalls()
self.bulk._end_bulk_operation(self.course_key)
self.assertConnCalls(
call.insert_structure(self.structure, self.course_key),
call.update_course_index(
- {'versions': {self.course_key.branch: self.structure['_id']}}, # lint-amnesty, pylint: disable=no-member
+ {'versions': {self.course_key.branch: self.structure['_id']}}, # pylint: disable=no-member
from_index=original_index,
course_context=self.course_key,
)
@@ -269,7 +269,7 @@ def test_write_index_and_multiple_structures_on_close(self):
self.bulk.update_structure(self.course_key.replace(branch='a'), self.structure)
other_structure = {'another': 'structure', '_id': ObjectId()}
self.bulk.update_structure(self.course_key.replace(branch='b'), other_structure)
- self.bulk.insert_course_index(self.course_key, {'versions': {'a': self.structure['_id'], 'b': other_structure['_id']}}) # lint-amnesty, pylint: disable=line-too-long
+ self.bulk.insert_course_index(self.course_key, {'versions': {'a': self.structure['_id'], 'b': other_structure['_id']}}) # noqa: E501
self.bulk._end_bulk_operation(self.course_key)
self.assertCountEqual( # noqa: PT009
[
@@ -295,7 +295,7 @@ def test_version_structure_new_course(self):
assert version_result == get_result
-class TestBulkWriteMixinClosedAfterPrevTransaction(TestBulkWriteMixinClosed, TestBulkWriteMixinPreviousTransaction): # lint-amnesty, pylint: disable=test-inherits-tests
+class TestBulkWriteMixinClosedAfterPrevTransaction(TestBulkWriteMixinClosed, TestBulkWriteMixinPreviousTransaction): # pylint: disable=test-inherits-tests
"""
Test that operations on with a closed transaction aren't affected by a previously executed transaction
"""
@@ -642,7 +642,7 @@ def test_copy_branch_versions(self):
self.conn.get_course_index.assert_called_once_with(self.course_key, ignore_case=False)
-class TestBulkWriteMixinOpenAfterPrevTransaction(TestBulkWriteMixinOpen, TestBulkWriteMixinPreviousTransaction): # lint-amnesty, pylint: disable=test-inherits-tests
+class TestBulkWriteMixinOpenAfterPrevTransaction(TestBulkWriteMixinOpen, TestBulkWriteMixinPreviousTransaction): # pylint: disable=test-inherits-tests
"""
Test that operations on with an open transaction aren't affected by a previously executed transaction
"""
diff --git a/xmodule/modulestore/tests/test_split_w_old_mongo.py b/xmodule/modulestore/tests/test_split_w_old_mongo.py
index e53a1984111a..4cf53d25a081 100644
--- a/xmodule/modulestore/tests/test_split_w_old_mongo.py
+++ b/xmodule/modulestore/tests/test_split_w_old_mongo.py
@@ -22,7 +22,7 @@
@pytest.mark.django_db
class SplitWMongoCourseBootstrapper(unittest.TestCase):
"""
- Helper for tests which need to construct split mongo & old mongo based courses to get interesting internal structure. # lint-amnesty, pylint: disable=line-too-long
+ Helper for tests which need to construct split mongo & old mongo based courses to get interesting internal structure.
Override _create_course and after invoking the super() _create_course, have it call _create_item for
each xblock you want in the course.
This class ensures the db gets created, opened, and cleaned up in addition to creating the course
@@ -33,7 +33,7 @@ class SplitWMongoCourseBootstrapper(unittest.TestCase):
* draft_mongo: a pointer to the old draft instance
* split_course_key (CourseLocator): of the new course
* old_course_key: the SlashSpecifiedCourseKey for the course
- """
+ """ # noqa: E501
# Snippet of what would be in the django settings envs file
db_config = {
'host': MONGO_HOST,
@@ -144,8 +144,8 @@ def _create_course(self, split=True):
if split:
# split requires the course to be created separately from creating items
self.split_mongo.create_course(
- self.split_course_key.org, self.split_course_key.course, self.split_course_key.run, self.user_id, fields=fields, root_block_id='runid' # lint-amnesty, pylint: disable=line-too-long
+ self.split_course_key.org, self.split_course_key.course, self.split_course_key.run, self.user_id, fields=fields, root_block_id='runid' # noqa: E501
)
- old_course = self.draft_mongo.create_course(self.split_course_key.org, 'test_course', 'runid', self.user_id, fields=fields) # lint-amnesty, pylint: disable=line-too-long
+ old_course = self.draft_mongo.create_course(self.split_course_key.org, 'test_course', 'runid', self.user_id, fields=fields) # noqa: E501
self.old_course_key = old_course.id
self.runtime = old_course.runtime
diff --git a/xmodule/modulestore/tests/test_xml.py b/xmodule/modulestore/tests/test_xml.py
index 608ebad7b66d..fe53b6075e3a 100644
--- a/xmodule/modulestore/tests/test_xml.py
+++ b/xmodule/modulestore/tests/test_xml.py
@@ -142,7 +142,7 @@ def test_dag_course(self, mock_logging):
assert shared_item_loc in other_parent.children
-class TestModuleStoreIgnore(TestXMLModuleStore): # lint-amnesty, pylint: disable=missing-class-docstring, test-inherits-tests
+class TestModuleStoreIgnore(TestXMLModuleStore): # pylint: disable=missing-class-docstring, test-inherits-tests
course_dir = DATA_DIR / "course_ignore"
def setUp(self):
diff --git a/xmodule/modulestore/tests/utils.py b/xmodule/modulestore/tests/utils.py
index 3aecc1076cda..3ee4bae47af3 100644
--- a/xmodule/modulestore/tests/utils.py
+++ b/xmodule/modulestore/tests/utils.py
@@ -376,7 +376,7 @@ def build_with_contentstore(self, contentstore, **kwargs):
names, generators = list(zip(*self.store_builders)) # noqa: B905
with ExitStack() as stack:
- modulestores = [stack.enter_context(gen.build_with_contentstore(contentstore, **kwargs)) for gen in generators] # lint-amnesty, pylint: disable=line-too-long
+ modulestores = [stack.enter_context(gen.build_with_contentstore(contentstore, **kwargs)) for gen in generators] # noqa: E501
# Make the modulestore creation function just return the already-created modulestores
store_iterator = iter(modulestores)
next_modulestore = lambda *args, **kwargs: next(store_iterator)
diff --git a/xmodule/modulestore/xml.py b/xmodule/modulestore/xml.py
index ef73c6bb0171..ddbbe973e1f3 100644
--- a/xmodule/modulestore/xml.py
+++ b/xmodule/modulestore/xml.py
@@ -532,7 +532,7 @@ def __str__(self):
'''
String representation - for debugging
'''
- return '<%s data_dir=%r, %d courselikes, %d modules>' % ( # xss-lint: disable=python-interpolate-html # noqa: UP031 # pylint: disable=line-too-long
+ return '<%s data_dir=%r, %d courselikes, %d modules>' % ( # xss-lint: disable=python-interpolate-html # noqa: E501, UP031
self.__class__.__name__, self.data_dir, len(self.courses), len(self.modules)
)
@@ -717,7 +717,7 @@ def get_id(org, course, url_name):
# always used, preventing duplicate keys.
return CourseKey.from_string('/'.join([org, course, url_name]))
- def load_extra_content(self, system, course_block, category, base_dir, course_dir, url_name): # lint-amnesty, pylint: disable=missing-function-docstring
+ def load_extra_content(self, system, course_block, category, base_dir, course_dir, url_name): # pylint: disable=missing-function-docstring
self._load_extra_content(system, course_block, category, base_dir, course_dir)
# then look in a override folder based on the course run
@@ -800,7 +800,7 @@ def _load_extra_content(self, system, course_block, category, content_path, cour
DictFieldData(data_content),
)
# VS[compat]:
- # Hack because we need to pull in the 'display_name' for static tabs (because we need to edit them) # lint-amnesty, pylint: disable=line-too-long
+ # Hack because we need to pull in the 'display_name' for static tabs (because we need to edit them) # noqa: E501
# from the course policy
if category == "static_tab":
tab = CourseTabList.get_tab_by_slug(tab_list=course_block.tabs, url_slug=slug)
@@ -839,7 +839,7 @@ def get_item(self, usage_key, depth=0, **kwargs): # lint-amnesty, pylint: disab
except KeyError:
raise ItemNotFoundError(usage_key) # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904
- def get_items(self, course_id, settings=None, content=None, revision=None, qualifiers=None, **kwargs): # lint-amnesty, pylint: disable=arguments-differ
+ def get_items(self, course_id, settings=None, content=None, revision=None, qualifiers=None, **kwargs): # pylint: disable=arguments-differ
"""
Returns:
list of XBlock instances for the matching items within the course with
diff --git a/xmodule/modulestore/xml_exporter.py b/xmodule/modulestore/xml_exporter.py
index 1421292c0d98..36d2d689e8a1 100644
--- a/xmodule/modulestore/xml_exporter.py
+++ b/xmodule/modulestore/xml_exporter.py
@@ -382,7 +382,7 @@ def adapt_references(subtree, destination_course_key, export_fs):
field.write_to(subtree, field.read_from(subtree).map_into_course(destination_course_key))
elif field_name == 'children':
# don't change the children field but do recurse over the children
- [adapt_references(child, destination_course_key, export_fs) for child in subtree.get_children()] # lint-amnesty, pylint: disable=expression-not-assigned
+ [adapt_references(child, destination_course_key, export_fs) for child in subtree.get_children()] # pylint: disable=expression-not-assigned
elif isinstance(field, ReferenceList):
field.write_to(
subtree,
@@ -391,7 +391,7 @@ def adapt_references(subtree, destination_course_key, export_fs):
elif isinstance(field, ReferenceValueDict):
field.write_to(
subtree, {
- key: ele.map_into_course(destination_course_key) for key, ele in field.read_from(subtree).items() # lint-amnesty, pylint: disable=line-too-long
+ key: ele.map_into_course(destination_course_key) for key, ele in field.read_from(subtree).items() # noqa: E501
}
)
@@ -411,7 +411,7 @@ def _export_field_content(xblock_item, item_dir):
sort_keys=True, indent=4).encode('utf-8'))
-def export_extra_content(export_fs, modulestore, source_course_key, dest_course_key, category_type, dirname, file_suffix=''): # lint-amnesty, pylint: disable=line-too-long, missing-function-docstring
+def export_extra_content(export_fs, modulestore, source_course_key, dest_course_key, category_type, dirname, file_suffix=''): # pylint: disable=missing-function-docstring # noqa: E501
items = modulestore.get_items(source_course_key, qualifiers={'category': category_type})
if len(items) > 0:
diff --git a/xmodule/modulestore/xml_importer.py b/xmodule/modulestore/xml_importer.py
index 88c88fa42fd2..691e9539af77 100644
--- a/xmodule/modulestore/xml_importer.py
+++ b/xmodule/modulestore/xml_importer.py
@@ -137,7 +137,7 @@ def __init__(self, static_content_store, course_data_path, target_id):
mimetypes.add_type('application/octet-stream', '.srt')
self.mimetypes_list = list(mimetypes.types_map.values())
- def import_static_content_directory(self, content_subdir=DEFAULT_STATIC_CONTENT_SUBDIR, verbose=False): # lint-amnesty, pylint: disable=missing-function-docstring
+ def import_static_content_directory(self, content_subdir=DEFAULT_STATIC_CONTENT_SUBDIR, verbose=False): # pylint: disable=missing-function-docstring
remap_dict = {}
static_dir = self.course_data_path / content_subdir
@@ -1191,7 +1191,7 @@ def create_xml_attributes(block, xml):
block.xml_attributes = xml_attrs
-def validate_no_non_editable_metadata(module_store, course_id, category): # lint-amnesty, pylint: disable=missing-function-docstring
+def validate_no_non_editable_metadata(module_store, course_id, category): # pylint: disable=missing-function-docstring
err_cnt = 0
for block_loc in module_store.modules[course_id]:
block = module_store.modules[course_id][block_loc]
@@ -1227,7 +1227,7 @@ def validate_category_hierarchy( # lint-amnesty, pylint: disable=missing-functi
return err_cnt
-def validate_data_source_path_existence(path, is_err=True, extra_msg=None): # lint-amnesty, pylint: disable=missing-function-docstring, redefined-outer-name
+def validate_data_source_path_existence(path, is_err=True, extra_msg=None): # pylint: disable=missing-function-docstring, redefined-outer-name
_cnt = 0
if not os.path.exists(path):
print(
diff --git a/xmodule/partitions/enrollment_track_partition_generator.py b/xmodule/partitions/enrollment_track_partition_generator.py
index 2eece8d1121e..a8d1a263f49a 100644
--- a/xmodule/partitions/enrollment_track_partition_generator.py
+++ b/xmodule/partitions/enrollment_track_partition_generator.py
@@ -51,7 +51,7 @@ def create_enrollment_track_partition(course):
used_ids = {p.id for p in course.user_partitions}
if ENROLLMENT_TRACK_PARTITION_ID in used_ids:
log.warning(
- "Can't add 'enrollment_track' partition, as ID {id} is assigned to {partition} in course {course}.".format( # noqa: UP032 # pylint: disable=line-too-long
+ "Can't add 'enrollment_track' partition, as ID {id} is assigned to {partition} in course {course}.".format( # noqa: UP032
id=ENROLLMENT_TRACK_PARTITION_ID,
partition=get_partition_from_id(course.user_partitions, ENROLLMENT_TRACK_PARTITION_ID).name,
course=str(course.id)
diff --git a/xmodule/partitions/partitions.py b/xmodule/partitions/partitions.py
index ece1c7eb4696..e90a485014d9 100644
--- a/xmodule/partitions/partitions.py
+++ b/xmodule/partitions/partitions.py
@@ -152,9 +152,9 @@ def get_scheme(name):
if not UserPartition.scheme_extensions:
UserPartition.scheme_extensions = ExtensionManager(namespace=USER_PARTITION_SCHEME_NAMESPACE)
try:
- scheme = UserPartition.scheme_extensions[name].plugin # lint-amnesty, pylint: disable=unsubscriptable-object
+ scheme = UserPartition.scheme_extensions[name].plugin # pylint: disable=unsubscriptable-object
except KeyError:
- raise UserPartitionError(f"Unrecognized scheme '{name}'") # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904
+ raise UserPartitionError(f"Unrecognized scheme '{name}'") # lint-amnesty, pylint: disable=raise-missing-from # noqa: B904, E501
scheme.name = name
return scheme
@@ -216,7 +216,7 @@ def from_json(value):
raise TypeError(f"UserPartition dict {value} has unrecognized scheme {scheme_id}")
if getattr(scheme, 'read_only', False):
- raise ReadOnlyUserPartitionError(f"UserPartition dict {value} uses scheme {scheme_id} which is read only") # lint-amnesty, pylint: disable=line-too-long
+ raise ReadOnlyUserPartitionError(f"UserPartition dict {value} uses scheme {scheme_id} which is read only")
if hasattr(scheme, "create_user_partition"):
return scheme.create_user_partition(
@@ -259,7 +259,7 @@ def get_group(self, group_id):
)
)
- def access_denied_message(self, block_key, user, user_group, allowed_groups): # lint-amnesty, pylint: disable=unused-argument
+ def access_denied_message(self, block_key, user, user_group, allowed_groups): # pylint: disable=unused-argument
"""
Return a message that should be displayed to the user when they are not allowed to access
content managed by this partition, or None if there is no applicable message.
@@ -274,7 +274,7 @@ def access_denied_message(self, block_key, user, user_group, allowed_groups): #
"""
return None
- def access_denied_fragment(self, block, user, user_group, allowed_groups): # lint-amnesty, pylint: disable=unused-argument
+ def access_denied_fragment(self, block, user, user_group, allowed_groups): # pylint: disable=unused-argument
"""
Return an html fragment that should be displayed to the user when they are not allowed to access
content managed by this partition, or None if there is no applicable message.
diff --git a/xmodule/partitions/tests/test_partitions.py b/xmodule/partitions/tests/test_partitions.py
index 73e2ff8c89dd..0a7bc9ec2e81 100644
--- a/xmodule/partitions/tests/test_partitions.py
+++ b/xmodule/partitions/tests/test_partitions.py
@@ -115,7 +115,7 @@ def get_group_for_user(self, course_id, user, user_partition, assign=True): # p
return groups[0]
-class MockEnrollmentTrackUserPartitionScheme(MockUserPartitionScheme): # lint-amnesty, pylint: disable=missing-class-docstring
+class MockEnrollmentTrackUserPartitionScheme(MockUserPartitionScheme): # pylint: disable=missing-class-docstring
def create_user_partition(self, id, name, description, groups=None, parameters=None, active=True): # pylint: disable=redefined-builtin, invalid-name
"""
diff --git a/xmodule/seq_block.py b/xmodule/seq_block.py
index ba482a285571..ad7edd78ccf5 100644
--- a/xmodule/seq_block.py
+++ b/xmodule/seq_block.py
@@ -594,7 +594,7 @@ def _student_or_public_view(self, context, prereq_met, prereq_meta_info, banner_
self._update_position(context, len(children))
fragment = Fragment()
- params = self._get_render_metadata(context, children, prereq_met, prereq_meta_info, banner_text, view, fragment) # lint-amnesty, pylint: disable=line-too-long
+ params = self._get_render_metadata(context, children, prereq_met, prereq_meta_info, banner_text, view, fragment)
if SHOW_PROGRESS_BAR.is_enabled() and getattr(settings, 'COMPLETION_AGGREGATOR_URL', ''):
parent_block_id = self.get_parent().scope_ids.usage_id.block_id
params['chapter_completion_aggregator_url'] = '/'.join(
@@ -794,7 +794,7 @@ def _render_student_view_for_blocks(self, context, children, fragment, view=STUD
content_type_gating_service = self.runtime.service(self, 'content_type_gating')
contains_content_type_gated_content = False
if content_type_gating_service:
- contains_content_type_gated_content = content_type_gating_service.check_children_for_content_type_gating_paywall( # pylint:disable=line-too-long
+ contains_content_type_gated_content = content_type_gating_service.check_children_for_content_type_gating_paywall( # noqa: E501
block, self.scope_ids.usage_id.context_key
) is not None
block_info = {
diff --git a/xmodule/split_test_block.py b/xmodule/split_test_block.py
index 489dcf74a01e..2de81c9ab189 100644
--- a/xmodule/split_test_block.py
+++ b/xmodule/split_test_block.py
@@ -88,7 +88,7 @@ class SplitTestFields:
)
user_partition_id = Integer(
- help=_("The configuration defines how users are grouped for this content experiment. Caution: Changing the group configuration of a student-visible experiment will impact the experiment data."), # lint-amnesty, pylint: disable=line-too-long
+ help=_("The configuration defines how users are grouped for this content experiment. Caution: Changing the group configuration of a student-visible experiment will impact the experiment data."), # noqa: E501
scope=Scope.content,
display_name=_("Group Configuration"),
default=no_partition_selected["value"],
@@ -248,7 +248,7 @@ def get_child_blocks(self):
child_block = self.get_child_block_by_location(child_location)
else:
# Oops. Config error.
- log.debug("configuration error in split test block: invalid group_id %r (not one of %r). Showing error", str_group_id, list(self.group_id_to_child.keys())) # lint-amnesty, pylint: disable=line-too-long
+ log.debug("configuration error in split test block: invalid group_id %r (not one of %r). Showing error", str_group_id, list(self.group_id_to_child.keys())) # noqa: E501
if child_block is None:
# Peak confusion is great. Now that we set child_block,
@@ -638,7 +638,7 @@ def validate_split_test(self):
split_validation.add(
StudioValidationMessage(
StudioValidationMessage.ERROR,
- _("The experiment uses a deleted group configuration. Select a valid group configuration or delete this experiment.") # lint-amnesty, pylint: disable=line-too-long
+ _("The experiment uses a deleted group configuration. Select a valid group configuration or delete this experiment.") # noqa: E501
)
)
else:
diff --git a/xmodule/tests/__init__.py b/xmodule/tests/__init__.py
index 8df1f59fe472..64426a705c74 100644
--- a/xmodule/tests/__init__.py
+++ b/xmodule/tests/__init__.py
@@ -40,7 +40,7 @@
DATA_DIR = MODULE_DIR.parent.parent / "common" / "test" / "data"
-def handler_url(block, handler, suffix='', query='', thirdparty=False): # lint-amnesty, pylint: disable=arguments-differ
+def handler_url(block, handler, suffix='', query='', thirdparty=False): # pylint: disable=arguments-differ
return '{usage_id}/{handler}{suffix}?{query}'.format( # noqa: UP032
usage_id=str(block.scope_ids.usage_id),
handler=handler,
@@ -70,7 +70,7 @@ class TestModuleStoreRuntime(ModuleStoreRuntime): # pylint: disable=abstract-me
"""
ModuleStore-based XBlock Runtime for testing
"""
- def handler_url(self, block, handler, suffix='', query='', thirdparty=False): # lint-amnesty, pylint: disable=arguments-differ
+ def handler_url(self, block, handler, suffix='', query='', thirdparty=False): # pylint: disable=arguments-differ
return '{usage_id}/{handler}{suffix}?{query}'.format( # noqa: UP032
usage_id=str(block.scope_ids.usage_id),
handler=handler,
@@ -164,7 +164,7 @@ def get_block(block):
'xqueue': XQueueService,
}
- descriptor_system.get_block_for_descriptor = get_block # lint-amnesty, pylint: disable=attribute-defined-outside-init
+ descriptor_system.get_block_for_descriptor = get_block # pylint: disable=attribute-defined-outside-init
descriptor_system._services.update(services) # lint-amnesty, pylint: disable=protected-access
return descriptor_system
@@ -406,8 +406,8 @@ def assertCoursesEqual(self, expected_store, expected_course_key, actual_store,
# compare published
with expected_store.branch_setting(ModuleStoreEnum.Branch.published_only, expected_course_key):
with actual_store.branch_setting(ModuleStoreEnum.Branch.published_only, actual_course_key):
- expected_items = expected_store.get_items(expected_course_key, revision=ModuleStoreEnum.RevisionOption.published_only) # lint-amnesty, pylint: disable=line-too-long
- actual_items = actual_store.get_items(actual_course_key, revision=ModuleStoreEnum.RevisionOption.published_only) # lint-amnesty, pylint: disable=line-too-long
+ expected_items = expected_store.get_items(expected_course_key, revision=ModuleStoreEnum.RevisionOption.published_only) # noqa: E501
+ actual_items = actual_store.get_items(actual_course_key, revision=ModuleStoreEnum.RevisionOption.published_only) # noqa: E501
assert len(expected_items) > 0
self._assertCoursesEqual(expected_items, actual_items, actual_course_key)
@@ -428,7 +428,7 @@ def assertCoursesEqual(self, expected_store, expected_course_key, actual_store,
actual_items = actual_store.get_items(actual_course_key, revision=revision)
self._assertCoursesEqual(expected_items, actual_items, actual_course_key, expect_drafts=True)
- def _assertCoursesEqual(self, expected_items, actual_items, actual_course_key, expect_drafts=False): # lint-amnesty, pylint: disable=unused-argument
+ def _assertCoursesEqual(self, expected_items, actual_items, actual_course_key, expect_drafts=False): # pylint: disable=unused-argument
"""
Actual algorithm to compare courses.
"""
@@ -448,7 +448,7 @@ def map_key(usage_key):
[key for key in actual_item_map.keys() if key[0] != 'course'],
)
for expected_item in expected_items:
- actual_item_location = actual_course_key.make_usage_key(expected_item.category, expected_item.location.block_id) # lint-amnesty, pylint: disable=line-too-long
+ actual_item_location = actual_course_key.make_usage_key(expected_item.category, expected_item.location.block_id) # noqa: E501
# split and old mongo use different names for the course root but we don't know which
# modulestore actual's come from here; so, assume old mongo and if that fails, assume split
if expected_item.location.block_type == 'course':
@@ -535,7 +535,7 @@ def assertAssetsEqual(self, expected_store, expected_course_key, actual_store, a
actual_thumbs = actual_store.get_all_content_thumbnails_for_course(actual_course_key)
self._assertAssetsEqual(expected_course_key, expected_thumbs, actual_course_key, actual_thumbs)
- def assertAssetsMetadataEqual(self, expected_modulestore, expected_course_key, actual_modulestore, actual_course_key): # lint-amnesty, pylint: disable=line-too-long
+ def assertAssetsMetadataEqual(self, expected_modulestore, expected_course_key, actual_modulestore, actual_course_key): # noqa: E501
"""
Assert that the modulestore asset metdata for the ``expected_course_key`` and the ``actual_course_key``
are equivalent.
diff --git a/xmodule/tests/test_annotatable_block.py b/xmodule/tests/test_annotatable_block.py
index c1282c008c22..2bf1780e8e2a 100644
--- a/xmodule/tests/test_annotatable_block.py
+++ b/xmodule/tests/test_annotatable_block.py
@@ -29,7 +29,7 @@ class _AnnotatableBlockTestCaseBase(TestCase): # lint-amnesty, pylint: disable=
The Iliad of Homer by Samuel Butler
- '''
+ ''' # noqa: E501
__test__ = False
@@ -55,7 +55,7 @@ def test_annotation_data_attr(self):
'data-problem-id': {'value': '0', '_delete': 'problem'}
}
- actual_attr = self.annotatable._get_annotation_data_attr(0, el) # lint-amnesty, pylint: disable=protected-access
+ actual_attr = self.annotatable._get_annotation_data_attr(0, el) # pylint: disable=protected-access
assert isinstance(actual_attr, dict)
self.assertDictEqual(expected_attr, actual_attr) # noqa: PT009
@@ -65,7 +65,7 @@ def test_annotation_class_attr_default(self):
el = etree.fromstring(xml)
expected_attr = {'class': {'value': 'annotatable-span highlight'}}
- actual_attr = self.annotatable._get_annotation_class_attr(0, el) # lint-amnesty, pylint: disable=protected-access
+ actual_attr = self.annotatable._get_annotation_class_attr(0, el) # pylint: disable=protected-access
assert isinstance(actual_attr, dict)
self.assertDictEqual(expected_attr, actual_attr) # noqa: PT009
@@ -83,7 +83,7 @@ def test_annotation_class_attr_with_valid_highlight(self):
'_delete': 'highlight'
}
}
- actual_attr = self.annotatable._get_annotation_class_attr(0, el) # lint-amnesty, pylint: disable=protected-access
+ actual_attr = self.annotatable._get_annotation_class_attr(0, el) # pylint: disable=protected-access
assert isinstance(actual_attr, dict)
self.assertDictEqual(expected_attr, actual_attr) # noqa: PT009
@@ -99,13 +99,13 @@ def test_annotation_class_attr_with_invalid_highlight(self):
'_delete': 'highlight'
}
}
- actual_attr = self.annotatable._get_annotation_class_attr(0, el) # lint-amnesty, pylint: disable=protected-access
+ actual_attr = self.annotatable._get_annotation_class_attr(0, el) # pylint: disable=protected-access
assert isinstance(actual_attr, dict)
self.assertDictEqual(expected_attr, actual_attr) # noqa: PT009
def test_render_annotation(self):
- expected_html = 'z ' # lint-amnesty, pylint: disable=line-too-long
+ expected_html = 'z ' # noqa: E501
expected_el = etree.fromstring(expected_html)
actual_el = etree.fromstring('z ')
diff --git a/xmodule/tests/test_annotator_mixin.py b/xmodule/tests/test_annotator_mixin.py
index 655d18ef343e..551f887c2aa9 100644
--- a/xmodule/tests/test_annotator_mixin.py
+++ b/xmodule/tests/test_annotator_mixin.py
@@ -22,10 +22,8 @@ class HelperFunctionTest(unittest.TestCase):
sample_sourceurl = "http://video-js.zencoder.com/oceans-clip.mp4"
sample_youtubeurl = "http://www.youtube.com/watch?v=yxLIu-scR9Y"
sample_html = 'Testing here and not bolded here
'
- # pylint: disable=line-too-long
- sample_html_with_image_alt = '''Testing here with image:
'''
- # pylint: disable=line-too-long
- sample_html_with_no_image_alt = '''Testing here with image:
'''
+ sample_html_with_image_alt = '''Testing here with image:
''' # noqa: E501
+ sample_html_with_no_image_alt = '''Testing here with image:
''' # noqa: E501
def test_get_instructions(self):
"""
diff --git a/xmodule/tests/test_capa_block.py b/xmodule/tests/test_capa_block.py
index 49860b8fa3cc..0e69862f7c72 100644
--- a/xmodule/tests/test_capa_block.py
+++ b/xmodule/tests/test_capa_block.py
@@ -2413,7 +2413,7 @@ def test_image_hint(self, render_template):
Test Template HTML
"
block = CapaFactory.create(xml=test_xml)
block.get_problem_html() # ignoring html result
diff --git a/xmodule/tests/test_conditional.py b/xmodule/tests/test_conditional.py
index d096b186986d..7d8e4d77cb6d 100644
--- a/xmodule/tests/test_conditional.py
+++ b/xmodule/tests/test_conditional.py
@@ -93,7 +93,7 @@ def create(system, source_is_error_block=False, source_visible_to_staff_only=Fal
# construct other blocks:
child_block = Mock(name='child_block')
child_block.visible_to_staff_only = False
- child_block._xmodule.student_view.return_value = Fragment(content='This is a secret
') # lint-amnesty, pylint: disable=protected-access
+ child_block._xmodule.student_view.return_value = Fragment(content='This is a secret
') # pylint: disable=protected-access
child_block.student_view = child_block._xmodule.student_view # lint-amnesty, pylint: disable=protected-access
child_block.runtime = system
child_block.render = lambda view, context=None: system.render(child_block, view, context)
@@ -158,7 +158,7 @@ def test_icon_class(self):
for attempted in ["false", "true"]:
for icon_class in ['other', 'problem', 'video']:
blocks['source_block'].is_attempted = attempted
- blocks['child_block'].get_icon_class = lambda: icon_class # lint-amnesty, pylint: disable=cell-var-from-loop # noqa: B023
+ blocks['child_block'].get_icon_class = lambda: icon_class # lint-amnesty, pylint: disable=cell-var-from-loop # noqa: B023, E501
assert blocks['cond_block'].get_icon_class() == icon_class
def test_get_html(self):
@@ -304,7 +304,7 @@ def test_conditional_block_parse_sources(self):
dummy_scope_ids = ScopeIds(None, None, dummy_location, dummy_location)
dummy_field_data = DictFieldData({
'data': '
- '''.format( # noqa: UP032
+ '''.format( # noqa: E501, UP032
org=ORG,
course=COURSE,
start=start,
@@ -123,7 +123,7 @@ class HasEndedMayCertifyTestCase(unittest.TestCase):
def setUp(self):
super().setUp()
- system = DummyModuleStoreRuntime(load_error_blocks=True) # lint-amnesty, pylint: disable=unused-variable # noqa: F841
+ system = DummyModuleStoreRuntime(load_error_blocks=True) # pylint: disable=unused-variable # noqa: F841
past_end = (datetime.now() - timedelta(days=12)).strftime("%Y-%m-%dT%H:%M:00")
future_end = (datetime.now() + timedelta(days=12)).strftime("%Y-%m-%dT%H:%M:00")
diff --git a/xmodule/tests/test_delay_between_attempts.py b/xmodule/tests/test_delay_between_attempts.py
index ead34f452291..ade948806fbc 100644
--- a/xmodule/tests/test_delay_between_attempts.py
+++ b/xmodule/tests/test_delay_between_attempts.py
@@ -196,7 +196,7 @@ def test_submit_quiz_too_soon(self):
)
# You should get a dialog that tells you to wait 2 minutes
# Also, the number of attempts should not be incremented
- self.assertRegex(result['success'], r"You must wait at least 3 minutes between submissions. 2 minutes remaining\..*") # lint-amnesty, pylint: disable=line-too-long # noqa: PT009
+ self.assertRegex(result['success'], r"You must wait at least 3 minutes between submissions. 2 minutes remaining\..*") # noqa: E501, PT009
assert block.attempts == num_attempts
def test_submit_quiz_1_second_too_soon(self):
@@ -210,7 +210,7 @@ def test_submit_quiz_1_second_too_soon(self):
)
# You should get a dialog that tells you to wait 2 minutes
# Also, the number of attempts should not be incremented
- self.assertRegex(result['success'], r"You must wait at least 3 minutes between submissions. 1 second remaining\..*") # lint-amnesty, pylint: disable=line-too-long # noqa: PT009
+ self.assertRegex(result['success'], r"You must wait at least 3 minutes between submissions. 1 second remaining\..*") # noqa: E501, PT009
assert block.attempts == num_attempts
def test_submit_quiz_as_soon_as_allowed(self):
@@ -275,7 +275,7 @@ def test_submit_quiz_with_long_delay(self):
)
# You should get a dialog that tells you to wait 2 minutes
# Also, the number of attempts should not be incremented
- self.assertRegex(result['success'], r"You must wait at least 2 hours between submissions. 2 minutes 1 second remaining\..*") # lint-amnesty, pylint: disable=line-too-long # noqa: PT009
+ self.assertRegex(result['success'], r"You must wait at least 2 hours between submissions. 2 minutes 1 second remaining\..*") # noqa: E501, PT009
assert block.attempts == num_attempts
def test_submit_quiz_with_involved_pretty_print(self):
@@ -289,7 +289,7 @@ def test_submit_quiz_with_involved_pretty_print(self):
)
# You should get a dialog that tells you to wait 2 minutes
# Also, the number of attempts should not be incremented
- self.assertRegex(result['success'], r"You must wait at least 2 hours 1 minute 3 seconds between submissions. 1 hour 2 minutes 59 seconds remaining\..*") # lint-amnesty, pylint: disable=line-too-long # noqa: PT009
+ self.assertRegex(result['success'], r"You must wait at least 2 hours 1 minute 3 seconds between submissions. 1 hour 2 minutes 59 seconds remaining\..*") # noqa: E501, PT009
assert block.attempts == num_attempts
def test_submit_quiz_with_nonplural_pretty_print(self):
@@ -303,5 +303,5 @@ def test_submit_quiz_with_nonplural_pretty_print(self):
)
# You should get a dialog that tells you to wait 2 minutes
# Also, the number of attempts should not be incremented
- self.assertRegex(result['success'], r"You must wait at least 1 minute between submissions. 1 minute remaining\..*") # lint-amnesty, pylint: disable=line-too-long # noqa: PT009
+ self.assertRegex(result['success'], r"You must wait at least 1 minute between submissions. 1 minute remaining\..*") # noqa: E501, PT009
assert block.attempts == num_attempts
diff --git a/xmodule/tests/test_graders.py b/xmodule/tests/test_graders.py
index bfe2f2e63e26..7767855d679d 100644
--- a/xmodule/tests/test_graders.py
+++ b/xmodule/tests/test_graders.py
@@ -365,7 +365,6 @@ def test_grader_from_conf(self):
(
# no drop_count
{'type': "Homework", 'min_count': 0},
- # pylint: disable=line-too-long
"__init__() missing 1 required positional argument: 'drop_count'"
),
)
diff --git a/xmodule/tests/test_html_block.py b/xmodule/tests/test_html_block.py
index 9b3d0e026a5a..23f28cb27e97 100644
--- a/xmodule/tests/test_html_block.py
+++ b/xmodule/tests/test_html_block.py
@@ -208,7 +208,7 @@ def test_index_dictionary_html_block_with_comment(self):
'.format( # noqa: UP032 # pylint: disable=line-too-long
+ response, '
'
- # pylint: disable=line-too-long
- expected_output = '[Example](https://example.com)\n\nParagraph text\n\n '
+ expected_output = '[Example](https://example.com)\n\nParagraph text\n\n ' # noqa: E501
self.assertEqual(utils.convert_html_to_markdown(input_text), expected_output) # noqa: PT009
diff --git a/lms/djangoapps/discussion/django_comment_client/utils.py b/lms/djangoapps/discussion/django_comment_client/utils.py
index 797d0b127043..113bffc4c94a 100644
--- a/lms/djangoapps/discussion/django_comment_client/utils.py
+++ b/lms/djangoapps/discussion/django_comment_client/utils.py
@@ -192,7 +192,7 @@ def get_discussion_id_map_entry(xblock):
xblock.discussion_id,
{
"location": xblock.location,
- "title": xblock.discussion_category.split("/")[-1].strip() + (" / " + xblock.discussion_target if xblock.discussion_target else "")
+ "title": xblock.discussion_category.split("/")[-1].strip() + (" / " + xblock.discussion_target if xblock.discussion_target else "") # noqa: E501
}
)
@@ -1086,8 +1086,7 @@ def replace_image(match):
return f"![{alt_text}]({url} \"{title}\")"
# Use a regular expression to match each 
You can add an optional hint like this. Problems that have a hint include a hint button, and this text appears the first time learners select the button.
- """
+ """ # noqa: E501
render_template.return_value = "