Ruff: Add and autofix PLR1714 (#13004)

Co-authored-by: Matt Tesauro <mtesauro@gmail.com>

Author: kiblik

dojo/api_v2/permissions.py

@@ -48,7 +48,7 @@ def check_object_permission(
 ):
     if request.method == "GET":
         return user_has_permission(request.user, obj, get_permission)
-    if request.method == "PUT" or request.method == "PATCH":
+    if request.method in {"PUT", "PATCH"}:
         return user_has_permission(request.user, obj, put_permission)
     if request.method == "DELETE":
         return user_has_permission(request.user, obj, delete_permission)

dojo/cred/views.py

@@ -616,7 +616,7 @@ def delete_cred_controller(request, destination_url, elem_id, ttid):
                     cred_id=cred.cred_id).exclude(finding__isnull=True)
                 message = "Credential is associated with finding(s). Remove the finding(s) before this credential can be deleted."
                 delete_cred = True
-        elif destination_url == "view_test" or destination_url == "view_finding":
+        elif destination_url in {"view_test", "view_finding"}:
             delete_cred = True
 
         # Allow deletion if no credentials are associated

dojo/engagement/views.py

@@ -280,7 +280,7 @@ def edit_engagement(request, eid):
             new_status = form.cleaned_data.get("status")
             engagement.product = form.cleaned_data.get("product")
             engagement = form.save(commit=False)
-            if (new_status == "Cancelled" or new_status == "Completed"):
+            if (new_status in {"Cancelled", "Completed"}):
                 engagement.active = False
             else:
                 engagement.active = True

dojo/finding/views.py

@@ -3327,10 +3327,7 @@ def calculate_possible_related_actions_for_similar_finding(
             },
         )
 
-        if (
-            similar_finding.duplicate_finding == finding
-            or similar_finding.duplicate_finding == finding.duplicate_finding
-        ):
+        if similar_finding.duplicate_finding in {finding, finding.duplicate_finding}:
             # duplicate inside the same cluster
             actions.append(
                 {

dojo/management/commands/migrate_surveys.py

@@ -54,7 +54,7 @@ def handle(self, *args, **options):
                 copy_string = "INSERT INTO `" + new_table_name + "` SELECT * FROM `" + table + "`;"
                 cursor.execute(str(copy_string))
                 # Update polymorphic id on some tables
-                if new_table_name == "dojo_question" or new_table_name == "dojo_answer":
+                if new_table_name in {"dojo_question", "dojo_answer"}:
                     update_string = "UPDATE `" + new_table_name + "` SET polymorphic_ctype_id = " + str(ctype_id) + ";"
                     cursor.execute(str(update_string))
                 # Drop the ddse table

dojo/product/views.py

@@ -640,7 +640,7 @@ def view_product_metrics(request, pid):
                 open_close_weekly[unix_timestamp] = {"closed": 0, "open": 1, "accepted": 0}
                 open_close_weekly[unix_timestamp]["week"] = html_date
 
-            if view == "Finding" or view == "Endpoint":
+            if view in {"Finding", "Endpoint"}:
                 severity = finding.get("severity")
 
             finding_age = calculate_finding_age(finding)

dojo/templatetags/display_tags.py

@@ -706,7 +706,7 @@ def get_severity_count(elem_id, table_type):
 
     if table_type == "test":
         display_counts.append("Total: " + str(total) + " Findings")
-    elif table_type == "engagement" or table_type == "product":
+    elif table_type in {"engagement", "product"}:
         display_counts.append("Total: " + str(total) + " Active Findings")
 
     return ", ".join([str(item) for item in display_counts])

dojo/tools/anchore_engine/parser.py

@@ -135,7 +135,7 @@ def get_findings_without_metadata(self, data, test):
             )
 
             sev = item["severity"]
-            if sev == "Negligible" or sev == "Unknown":
+            if sev in {"Negligible", "Unknown"}:
                 sev = "Info"
 
             mitigation = (

dojo/tools/anchore_grype/parser.py

@@ -206,7 +206,7 @@ def get_findings(self, file, test):
         return list(dupes.values())
 
     def _convert_severity(self, val):
-        if val == "Unknown" or val == "Negligible":
+        if val in {"Unknown", "Negligible"}:
             return "Info"
         return val.title()
 

dojo/tools/anchorectl_vulns/parser.py

@@ -51,7 +51,7 @@ def get_findings(self, filename, test):
             )
 
             sev = item["severity"]
-            if sev == "Negligible" or sev == "Unknown":
+            if sev in {"Negligible", "Unknown"}:
                 sev = "Info"
 
             if item["fix"] != "None":