Ruff: Add and autofix PLR1711 (#13003)

Author: kiblik

dojo/importers/base_importer.py

@@ -286,8 +286,6 @@ def update_test_meta(self):
         if not self.commit_hash.isspace():
             self.test.commit_hash = self.commit_hash
 
-        return
-
     def update_timestamps(self):
         """
         Update the target end dates for tests as imports are occurring:

dojo/importers/endpoint_manager.py

@@ -53,7 +53,6 @@ def add_endpoints_to_unsaved_finding(
                 endpoint=ep,
                 defaults={"date": finding.date})
         logger.debug(f"IMPORT_SCAN: {len(endpoints)} endpoints imported")
-        return
 
     @dojo_async_task
     @app.task()
@@ -73,7 +72,6 @@ def mitigate_endpoint_status(
                 endpoint_status.mitigated_by = user
                 endpoint_status.mitigated = True
                 endpoint_status.save()
-        return
 
     @dojo_async_task
     @app.task()
@@ -92,7 +90,6 @@ def reactivate_endpoint_status(
                 endpoint_status.mitigated = False
                 endpoint_status.last_modified = timezone.now()
                 endpoint_status.save()
-        return
 
     def chunk_endpoints_and_disperse(
         self,
@@ -101,7 +98,6 @@ def chunk_endpoints_and_disperse(
         **kwargs: dict,
     ) -> None:
         self.add_endpoints_to_unsaved_finding(finding, endpoints, sync=True)
-        return
 
     def clean_unsaved_endpoints(
         self,
@@ -116,15 +112,13 @@ def clean_unsaved_endpoints(
                 endpoint.clean()
             except ValidationError as e:
                 logger.warning(f"DefectDojo is storing broken endpoint because cleaning wasn't successful: {e}")
-        return
 
     def chunk_endpoints_and_reactivate(
         self,
         endpoint_status_list: list[Endpoint_Status],
         **kwargs: dict,
     ) -> None:
         self.reactivate_endpoint_status(endpoint_status_list, sync=True)
-        return
 
     def chunk_endpoints_and_mitigate(
         self,
@@ -133,7 +127,6 @@ def chunk_endpoints_and_mitigate(
         **kwargs: dict,
     ) -> None:
         self.mitigate_endpoint_status(endpoint_status_list, user, sync=True)
-        return
 
     def update_endpoint_status(
         self,
@@ -166,4 +159,3 @@ def update_endpoint_status(
             )
             self.chunk_endpoints_and_reactivate(endpoint_status_to_reactivate)
         self.chunk_endpoints_and_mitigate(endpoint_status_to_mitigate, user)
-        return

dojo/risk_acceptance/helper.py

@@ -136,8 +136,6 @@ def remove_finding_from_risk_acceptance(user: Dojo_User, risk_acceptance: Risk_A
             author=user,
         ))
 
-    return
-
 
 def add_findings_to_risk_acceptance(user: Dojo_User, risk_acceptance: Risk_Acceptance, findings: list[Finding]) -> None:
     for finding in findings:
@@ -167,8 +165,6 @@ def add_findings_to_risk_acceptance(user: Dojo_User, risk_acceptance: Risk_Accep
     # best effort jira integration, no status changes
     post_jira_comments(risk_acceptance, findings, accepted_message_creator)
 
-    return
-
 
 @app.task
 def expiration_handler(*args, **kwargs):

dojo/system_settings/views.py

@@ -115,8 +115,6 @@ def get_celery_status(
             context["celery_msg"] = "Celery needs to have the setting CELERY_RESULT_BACKEND = 'db+sqlite:///dojo.celeryresults.sqlite' set in settings.py."
             context["celery_status"] = "Unknown"
 
-        return
-
     def get_template(self) -> str:
         return "dojo/system_settings.html"
 

dojo/tools/cyclonedx/json_parser.py

@@ -141,4 +141,3 @@ def _flatten_components(self, components, flatted_components):
             # tools don't provide it
             if "bom-ref" in component:
                 flatted_components[component["bom-ref"]] = component
-        return

dojo/user/validators.py

@@ -13,7 +13,6 @@ def validate(self, password, user=None):
             raise ValidationError(
                 self.get_help_text(),
                 code="password_too_short")
-        return
 
     def get_help_text(self):
         return gettext("Password must be at least %s characters long.") % get_system_setting("minimum_password_length")
@@ -25,7 +24,6 @@ def validate(self, password, user=None):
             raise ValidationError(
                 self.get_help_text(),
                 code="password_too_short")
-        return
 
     def get_help_text(self):
         return gettext("Password must be less than %s characters long.") % get_system_setting("maximum_password_length")
@@ -37,7 +35,6 @@ def validate(self, password, user=None):
             raise ValidationError(
                 self.get_help_text(),
                 code="password_no_number")
-        return
 
     def get_help_text(self):
         return gettext("Password must contain at least 1 digit, 0-9.")
@@ -49,7 +46,6 @@ def validate(self, password, user=None):
             raise ValidationError(
                 self.get_help_text(),
                 code="password_no_upper")
-        return
 
     def get_help_text(self):
         return gettext("Password must contain at least 1 uppercase letter, A-Z.")
@@ -61,7 +57,6 @@ def validate(self, password, user=None):
             raise ValidationError(
                 self.get_help_text(),
                 code="password_no_lower")
-        return
 
     def get_help_text(self):
         return gettext("Password must contain at least 1 lowercase letter, a-z.")
@@ -74,7 +69,6 @@ def validate(self, password, user=None):
             raise ValidationError(
                 self.get_help_text(),
                 code="password_no_symbol")
-        return
 
     def get_help_text(self):
         return gettext(

ruff.toml

@@ -84,7 +84,7 @@ select = [
    "PGH",
    "PLC01", "PLC02", "PLC0414", "PLC18", "PLC24", "PLC28", "PLC3",
    "PLE",
-   "PLR01", "PLR02", "PLR04", "PLR0915", "PLR1716", "PLR172", "PLR173", "PLR2044", "PLR5", "PLR6104", "PLR6201",
+   "PLR01", "PLR02", "PLR04", "PLR0915", "PLR1711", "PLR1716", "PLR172", "PLR173", "PLR2044", "PLR5", "PLR6104", "PLR6201", #"PLR",
    "PLW01", "PLW02", "PLW04", "PLW0602", "PLW0604", "PLW07", "PLW1", "PLW2", "PLW3",
    "UP",
    "FURB",