Skip to content

Commit d3e6474

Browse files
feanilclaude
andcommitted
style: suppress pylint line-too-long on lines made long by noqa comments
The ruff --add-noqa pass added # noqa: <RULE> comments to all lines with existing violations. Pylint's C0301 (line-too-long) counts the full line including trailing comments, so these additions pushed 292 lines over 120 chars. Add per-line # pylint: disable=line-too-long to each of those lines. On lines that already had a # pylint: disable=<something> clause, extend the existing clause (e.g. # pylint: disable=raise-missing-from,line-too-long) rather than adding a second directive. Also removes # lint-amnesty, prefixes encountered during the edit pass -- these were temporary suppressions that are no longer needed. This suppression is temporary while both pylint and ruff are running. Once we drop pylint (PR 4+), all these per-line # pylint: disable=line-too-long comments can be removed as part of that cleanup. Co-Authored-By: Claude Sonnet 4.6 <[email protected]>
1 parent fa5eaae commit d3e6474

165 files changed

Lines changed: 292 additions & 292 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

cms/djangoapps/contentstore/rest_api/v1/views/tests/test_videos.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,14 +120,14 @@ def test_VideoTranscriptEnabledFlag_enabled(self):
120120
str(self.course.id)
121121
)
122122
self.assertIn("transcript_preferences_handler_url", transcript_settings) # noqa: PT009
123-
self.assertEqual(expected_preference_handler, transcript_settings["transcript_preferences_handler_url"]) # noqa: PT009
123+
self.assertEqual(expected_preference_handler, transcript_settings["transcript_preferences_handler_url"]) # noqa: PT009 # pylint: disable=line-too-long
124124

125125
expected_credentials_handler = reverse_course_url(
126126
'transcript_credentials_handler',
127127
str(self.course.id)
128128
)
129129
self.assertIn("transcript_credentials_handler_url", transcript_settings) # noqa: PT009
130-
self.assertEqual(expected_credentials_handler, transcript_settings["transcript_credentials_handler_url"]) # noqa: PT009
130+
self.assertEqual(expected_credentials_handler, transcript_settings["transcript_credentials_handler_url"]) # noqa: PT009 # pylint: disable=line-too-long
131131
with patch(
132132
'openedx.core.djangoapps.video_config.toggles.XPERT_TRANSLATIONS_UI.is_enabled'
133133
) as xpertTranslationfeature:

cms/djangoapps/contentstore/signals/handlers.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ def wrapper(*args, **kwargs):
7575
return task_decorator
7676

7777

78-
def _create_catalog_data_for_signal(course_key: CourseKey) -> (Optional[datetime], Optional[CourseCatalogData]): # noqa: UP045
78+
def _create_catalog_data_for_signal(course_key: CourseKey) -> (Optional[datetime], Optional[CourseCatalogData]): # noqa: UP045 # pylint: disable=line-too-long
7979
"""
8080
Creates data for catalog-info-changed signal when course is published.
8181

cms/djangoapps/contentstore/tasks.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -525,7 +525,7 @@ def sync_discussion_settings(course_key, user):
525525

526526
fields = ["enable_graded_units", "unit_level_visibility", "enable_in_context", "posting_restrictions"]
527527
# Plugin configuration is stored in the course settings under the provider name.
528-
field_mappings = dict(zip(fields, fields)) | {"plugin_configuration": discussion_config.provider_type} # noqa: B905
528+
field_mappings = dict(zip(fields, fields)) | {"plugin_configuration": discussion_config.provider_type} # noqa: B905 # pylint: disable=line-too-long
529529

530530
for attr_name, settings_key in field_mappings.items():
531531
if settings_key in discussion_settings:

cms/djangoapps/contentstore/tests/test_clone_course.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ def test_rerun_course(self):
136136
result = rerun_course.delay(str(split_course3_id), str(split_course4_id), self.user.id,
137137
json.dumps(fields, cls=EdxJSONEncoder))
138138
self.assertIn("exception: ", result.get()) # noqa: PT009
139-
self.assertIsNone(self.store.get_course(split_course4_id), "Didn't delete course after error") # noqa: PT009
139+
self.assertIsNone(self.store.get_course(split_course4_id), "Didn't delete course after error") # noqa: PT009 # pylint: disable=line-too-long
140140
CourseRerunState.objects.find_first(
141141
course_key=split_course4_id,
142142
state=CourseRerunUIStateManager.State.FAILED

cms/djangoapps/contentstore/tests/test_contentstore.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -441,7 +441,7 @@ def test_html_export_roundtrip(self):
441441

442442
# get the sample HTML with styling information
443443
html_block = self.store.get_item(course_id.make_usage_key('html', 'with_styling'))
444-
self.assertIn('<p style="font:italic bold 72px/30px Georgia, serif; color: red; ">', html_block.data) # noqa: PT009
444+
self.assertIn('<p style="font:italic bold 72px/30px Georgia, serif; color: red; ">', html_block.data) # noqa: PT009 # pylint: disable=line-too-long
445445

446446
# get the sample HTML with just a simple <img> tag information
447447
html_block = self.store.get_item(course_id.make_usage_key('html', 'just_img'))
@@ -1921,7 +1921,7 @@ def test_rerun_course_video_upload_token(self):
19211921
# Verify video upload pipeline is empty.
19221922
source_course = self.store.get_course(source_course.id)
19231923
new_course = self.store.get_course(destination_course_key)
1924-
self.assertDictEqual(source_course.video_upload_pipeline, {"course_video_upload_token": 'test-token'}) # noqa: PT009
1924+
self.assertDictEqual(source_course.video_upload_pipeline, {"course_video_upload_token": 'test-token'}) # noqa: PT009 # pylint: disable=line-too-long
19251925
self.assertEqual(new_course.video_upload_pipeline, {}) # noqa: PT009
19261926

19271927
def test_rerun_course_success(self):

cms/djangoapps/contentstore/tests/test_course_listing.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -407,7 +407,7 @@ def _set_of_course_keys(course_list, key_attribute_name='id'):
407407
return {getattr(c, key_attribute_name) for c in course_list}
408408

409409
found_courses, unsucceeded_course_actions = _accessible_courses_iter_for_tests(self.request)
410-
self.assertSetEqual(_set_of_course_keys(courses + courses_in_progress), _set_of_course_keys(found_courses)) # noqa: PT009
410+
self.assertSetEqual(_set_of_course_keys(courses + courses_in_progress), _set_of_course_keys(found_courses)) # noqa: PT009 # pylint: disable=line-too-long
411411
self.assertSetEqual( # noqa: PT009
412412
_set_of_course_keys(courses_in_progress), _set_of_course_keys(unsucceeded_course_actions, 'course_key')
413413
)

cms/djangoapps/contentstore/tests/test_course_settings.py

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ def test_disable_advanced_settings_feature(self, disable_advanced_settings):
174174
If this feature is enabled, only Django Staff/Superuser should be able to access the "Advanced Settings" page.
175175
For non-staff users the "Advanced Settings" tab link should not be visible.
176176
"""
177-
advanced_settings_link_html = f"<a href=\"{self.course_setting_url}\">Advanced Settings</a>".encode('utf-8') # noqa: UP012
177+
advanced_settings_link_html = f"<a href=\"{self.course_setting_url}\">Advanced Settings</a>".encode('utf-8') # noqa: UP012 # pylint: disable=line-too-long
178178

179179
with override_settings(FEATURES={
180180
'DISABLE_ADVANCED_SETTINGS': disable_advanced_settings,
@@ -280,9 +280,9 @@ def compare_details_with_encoding(self, encoded, details, context):
280280
details['about_sidebar_html'], encoded['about_sidebar_html'], context + " about_sidebar_html not =="
281281
)
282282
self.assertEqual(details['overview'], encoded['overview'], context + " overviews not ==") # noqa: PT009
283-
self.assertEqual(details['intro_video'], encoded.get('intro_video', None), context + " intro_video not ==") # noqa: PT009
283+
self.assertEqual(details['intro_video'], encoded.get('intro_video', None), context + " intro_video not ==") # noqa: PT009 # pylint: disable=line-too-long
284284
self.assertEqual(details['effort'], encoded['effort'], context + " efforts not ==") # noqa: PT009
285-
self.assertEqual(details['course_image_name'], encoded['course_image_name'], context + " images not ==") # noqa: PT009
285+
self.assertEqual(details['course_image_name'], encoded['course_image_name'], context + " images not ==") # noqa: PT009 # pylint: disable=line-too-long
286286
self.assertEqual(details['language'], encoded['language'], context + " languages not ==") # noqa: PT009
287287

288288
def compare_date_fields(self, details, encoded, context, field):
@@ -323,7 +323,7 @@ def test_upgrade_deadline(self, has_verified_mode, has_expiration_date):
323323

324324
settings_details_url = get_url(self.course.id)
325325
response = self.client.get_html(settings_details_url)
326-
self.assertEqual(b"Upgrade Deadline Date" in response.content, has_expiration_date and has_verified_mode) # noqa: PT009
326+
self.assertEqual(b"Upgrade Deadline Date" in response.content, has_expiration_date and has_verified_mode) # noqa: PT009 # pylint: disable=line-too-long
327327

328328
@mock.patch.dict("django.conf.settings.FEATURES", {'ENABLE_PREREQUISITE_COURSES': True})
329329
@override_waffle_flag(toggles.LEGACY_STUDIO_SCHEDULE_DETAILS, True)
@@ -906,7 +906,7 @@ def test_update_cutoffs_from_json(self, tracker, uuid):
906906
test_grader.grade_cutoffs['Pass'] = 0.75
907907
CourseGradingModel.update_cutoffs_from_json(self.course.id, test_grader.grade_cutoffs, self.user)
908908
altered_grader = CourseGradingModel.fetch(self.course.id)
909-
self.assertDictEqual(test_grader.grade_cutoffs, altered_grader.grade_cutoffs, "cutoff change 'Pass'") # noqa: PT009
909+
self.assertDictEqual(test_grader.grade_cutoffs, altered_grader.grade_cutoffs, "cutoff change 'Pass'") # noqa: PT009 # pylint: disable=line-too-long
910910
grading_policy_3 = self._grading_policy_hash_for_course()
911911

912912
# one for each of the calls to update_cutoffs_from_json()
@@ -936,7 +936,7 @@ def test_delete_grace_period(self):
936936
CourseGradingModel.update_grace_period_from_json(
937937
self.course.id, test_grader.grace_period, self.user)
938938
altered_grader = CourseGradingModel.fetch(self.course.id)
939-
self.assertDictEqual(test_grader.grace_period, altered_grader.grace_period, "Adding in a grace period") # noqa: PT009
939+
self.assertDictEqual(test_grader.grace_period, altered_grader.grace_period, "Adding in a grace period") # noqa: PT009 # pylint: disable=line-too-long
940940

941941
test_grader.grace_period = {'hours': 1, 'minutes': 10, 'seconds': 0}
942942
# Now delete the grace period
@@ -1346,7 +1346,7 @@ def test_validate_from_json_correct_inputs(self):
13461346

13471347
# Tab gets tested in test_advanced_settings_munge_tabs
13481348
self.assertIn('advanced_modules', test_model, 'Missing advanced_modules') # noqa: PT009
1349-
self.assertEqual(test_model['advanced_modules']['value'], ['notes'], 'advanced_module is not updated') # noqa: PT009
1349+
self.assertEqual(test_model['advanced_modules']['value'], ['notes'], 'advanced_module is not updated') # noqa: PT009 # pylint: disable=line-too-long
13501350

13511351
def test_validate_from_json_wrong_inputs(self):
13521352
# input incorrectly formatted data
@@ -1417,7 +1417,7 @@ def test_update_from_json(self):
14171417
self.assertIn('display_name', test_model, 'Missing editable metadata field') # noqa: PT009
14181418
self.assertEqual(test_model['display_name']['value'], 'jolly roger', "not expected value") # noqa: PT009
14191419
self.assertIn('advertised_start', test_model, 'Missing revised advertised_start metadata field') # noqa: PT009
1420-
self.assertEqual(test_model['advertised_start']['value'], 'start B', "advertised_start not expected value") # noqa: PT009
1420+
self.assertEqual(test_model['advertised_start']['value'], 'start B', "advertised_start not expected value") # noqa: PT009 # pylint: disable=line-too-long
14211421

14221422
def update_check(self, test_model):
14231423
"""
@@ -1426,9 +1426,9 @@ def update_check(self, test_model):
14261426
self.assertIn('display_name', test_model, 'Missing editable metadata field') # noqa: PT009
14271427
self.assertEqual(test_model['display_name']['value'], self.course.display_name) # noqa: PT009
14281428
self.assertIn('advertised_start', test_model, 'Missing new advertised_start metadata field') # noqa: PT009
1429-
self.assertEqual(test_model['advertised_start']['value'], 'start A', "advertised_start not expected value") # noqa: PT009
1429+
self.assertEqual(test_model['advertised_start']['value'], 'start A', "advertised_start not expected value") # noqa: PT009 # pylint: disable=line-too-long
14301430
self.assertIn('days_early_for_beta', test_model, 'Missing days_early_for_beta metadata field') # noqa: PT009
1431-
self.assertEqual(test_model['days_early_for_beta']['value'], 2, "days_early_for_beta not expected value") # noqa: PT009
1431+
self.assertEqual(test_model['days_early_for_beta']['value'], 2, "days_early_for_beta not expected value") # noqa: PT009 # pylint: disable=line-too-long
14321432

14331433
def test_http_fetch_initial_fields(self):
14341434
response = self.client.get_json(self.course_setting_url)
@@ -1465,7 +1465,7 @@ def test_http_update_from_json(self):
14651465
self.assertIn('display_name', test_model, 'Missing editable metadata field') # noqa: PT009
14661466
self.assertEqual(test_model['display_name']['value'], 'jolly roger', "not expected value") # noqa: PT009
14671467
self.assertIn('advertised_start', test_model, 'Missing revised advertised_start metadata field') # noqa: PT009
1468-
self.assertEqual(test_model['advertised_start']['value'], 'start B', "advertised_start not expected value") # noqa: PT009
1468+
self.assertEqual(test_model['advertised_start']['value'], 'start B', "advertised_start not expected value") # noqa: PT009 # pylint: disable=line-too-long
14691469

14701470
@patch.dict(settings.FEATURES, {'ENABLE_EDXNOTES': True})
14711471
@patch('xmodule.util.xmodule_django.get_current_request')

cms/djangoapps/contentstore/tests/test_courseware_index.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -387,7 +387,7 @@ def _test_course_about_store_index(self, store):
387387
field_dictionary={"course": str(self.course.id)}
388388
)
389389
self.assertEqual(response["total"], 1) # noqa: PT009
390-
self.assertEqual(response["results"][0]["data"]["content"]["short_description"], short_description) # noqa: PT009
390+
self.assertEqual(response["results"][0]["data"]["content"]["short_description"], short_description) # noqa: PT009 # pylint: disable=line-too-long
391391

392392
def _test_course_about_mode_index(self, store):
393393
"""
@@ -459,7 +459,7 @@ def _test_course_location_null(self, store):
459459

460460
result = response["results"][0]["data"]
461461
self.assertEqual(result["course_name"], "Search Index Test Course") # noqa: PT009
462-
self.assertEqual(result["location"], ["Week 1", CoursewareSearchIndexer.UNNAMED_MODULE_NAME, "Subsection 2"]) # noqa: PT009
462+
self.assertEqual(result["location"], ["Week 1", CoursewareSearchIndexer.UNNAMED_MODULE_NAME, "Subsection 2"]) # noqa: PT009 # pylint: disable=line-too-long
463463

464464
@patch('django.conf.settings.SEARCH_ENGINE', 'search.tests.utils.ErroringIndexEngine')
465465
def _test_exception(self, store):
@@ -1199,7 +1199,7 @@ def test_content_group_gets_indexed(self):
11991199
self.assertIn(self._html_experiment_group_result(self.html_unit4, [str(2)]), indexed_content) # noqa: PT009
12001200
self.assertIn(self._html_experiment_group_result(self.html_unit5, [str(3)]), indexed_content) # noqa: PT009
12011201
self.assertIn(self._html_experiment_group_result(self.html_unit6, [str(4)]), indexed_content) # noqa: PT009
1202-
self.assertNotIn(self._html_experiment_group_result(self.html_unit6, [str(5)]), indexed_content) # noqa: PT009
1202+
self.assertNotIn(self._html_experiment_group_result(self.html_unit6, [str(5)]), indexed_content) # noqa: PT009 # pylint: disable=line-too-long
12031203
self.assertIn( # noqa: PT009
12041204
self._vertical_experiment_group_result(self.condition_0_vertical, [str(2)]),
12051205
indexed_content

cms/djangoapps/contentstore/tests/test_import_draft_order.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ def test_order(self):
3838
# '5a05be9d59fc4bb79282c94c9e6b88c7' and 'second' are public verticals.
3939
self.assertEqual(7, len(verticals)) # noqa: PT009
4040
self.assertEqual(course_key.make_usage_key('vertical', 'z'), verticals[0]) # noqa: PT009
41-
self.assertEqual(course_key.make_usage_key('vertical', '5a05be9d59fc4bb79282c94c9e6b88c7'), verticals[1]) # noqa: PT009
41+
self.assertEqual(course_key.make_usage_key('vertical', '5a05be9d59fc4bb79282c94c9e6b88c7'), verticals[1]) # noqa: PT009 # pylint: disable=line-too-long
4242
self.assertEqual(course_key.make_usage_key('vertical', 'a'), verticals[2]) # noqa: PT009
4343
self.assertEqual(course_key.make_usage_key('vertical', 'second'), verticals[3]) # noqa: PT009
4444
self.assertEqual(course_key.make_usage_key('vertical', 'b'), verticals[4]) # noqa: PT009

cms/djangoapps/contentstore/tests/test_libraries.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -499,10 +499,10 @@ def test_library_filters(self):
499499
self._create_library(library="l3", display_name="Library-Title-3", org='org-test1')
500500
self._create_library(library="l4", display_name="Library-Title-4", org='org-test2')
501501

502-
self.assertEqual(len(self.client.get_json(LIBRARY_REST_URL).json()), 5) # 1 more from self.setUp() # noqa: PT009
502+
self.assertEqual(len(self.client.get_json(LIBRARY_REST_URL).json()), 5) # 1 more from self.setUp() # noqa: PT009 # pylint: disable=line-too-long
503503
self.assertEqual(len(self.client.get_json(f'{LIBRARY_REST_URL}?org=org-test1').json()), 2) # noqa: PT009
504504
self.assertEqual(len(self.client.get_json(f'{LIBRARY_REST_URL}?text_search=test-lib').json()), 2) # noqa: PT009
505-
self.assertEqual(len(self.client.get_json(f'{LIBRARY_REST_URL}?text_search=library-title').json()), 3) # noqa: PT009
505+
self.assertEqual(len(self.client.get_json(f'{LIBRARY_REST_URL}?text_search=library-title').json()), 3) # noqa: PT009 # pylint: disable=line-too-long
506506
self.assertEqual(len(self.client.get_json(f'{LIBRARY_REST_URL}?text_search=library-').json()), 3) # noqa: PT009
507507
self.assertEqual(len(self.client.get_json(f'{LIBRARY_REST_URL}?text_search=org-test').json()), 3) # noqa: PT009
508508

0 commit comments

Comments
 (0)