Ruff: Add B018 rule (#12110)

* Ruff: Add B018 rule

* update

* fix

Author: manuel-sommer

dojo/management/commands/jira_status_reconciliation.py

@@ -75,8 +75,6 @@ def jira_status_reconciliation(*args, **kwargs):
         # convert from str to datetime
         issue_from_jira.fields.updated = parse_datetime(issue_from_jira.fields.updated)
 
-        find.jira_issue.jira_change, issue_from_jira.fields.updated, find.last_status_update, issue_from_jira.fields.updated, find.last_reviewed, issue_from_jira.fields.updated
-
         flag1, flag2, flag3 = None, None, None
 
         if mode == "reconcile" and not find.last_status_update:

dojo/templatetags/display_tags.py

@@ -1013,11 +1013,6 @@ def import_history(finding, *, autoescape=True):
     if not finding or not settings.TRACK_IMPORT_HISTORY:
         return ""
 
-    if autoescape:
-        conditional_escape
-    else:
-        lambda x: x
-
     # prefetched, so no filtering here
     status_changes = finding.test_import_finding_action_set.all()
 

dojo/tools/checkmarx/parser.py

@@ -171,7 +171,6 @@ def _get_findings_xml(self, filename, test):
             # consolidate vuln_ids_from_tool values
             if self.mode != "detailed":
                 for key in list(dupes):
-                    vuln_ids_from_tool[key].sort
                     dupes[key].vuln_id_from_tool = ",".join(
                         vuln_ids_from_tool[key],
                     )[:500]

dojo/tools/risk_recon/parser.py

@@ -110,7 +110,7 @@ def _get_findings_internal(self, findings, test):
 
             if dupe_key in dupes:
                 find = dupes[dupe_key]
-                find.nb_occurences
+                find.nb_occurences += 1
             else:
                 dupes[dupe_key] = finding
 

ruff.toml

@@ -88,7 +88,7 @@ select = [
    "FURB",
    "DOC202", "DOC403", "DOC502",
    "RUF",
-   "B00", "B010", "B011", "B012", "B013", "B014", "B015", "B016", "B017", "B019", "B020", "B021", "B022", "B023", "B025", "B028", "B029", "B03", "B901", "B903", "B905", "B911",
+   "B00", "B010", "B011", "B012", "B013", "B014", "B015", "B016", "B017", "B018", "B019", "B020", "B021", "B022", "B023", "B025", "B028", "B029", "B03", "B901", "B903", "B905", "B911",
    "PERF1", "PERF2",
 ]
 ignore = [

tests/finding_test.py

@@ -312,8 +312,6 @@ def test_simple_accept_finding(self):
         self.goto_all_findings_list(driver)
         # Select and click on the particular finding to edit
         driver.find_element(By.LINK_TEXT, "App Vulnerable to XSS").click()
-        # Get the status of the current endpoint
-        driver.find_element(By.XPATH, '//*[@id="vuln_endpoints"]/tbody/tr/td[3]').text
         # Click on the 'dropdownMenu1 button'
         driver.find_element(By.ID, "dropdownMenu1").click()
         # Click on `Close Finding`
@@ -336,8 +334,6 @@ def test_unaccept_finding(self):
         self.goto_all_findings_list(driver)
         # Select and click on the particular finding to edit
         driver.find_element(By.LINK_TEXT, "App Vulnerable to XSS").click()
-        # Get the status of the current endpoint
-        driver.find_element(By.XPATH, '//*[@id="remd_endpoints"]/tbody/tr/td[3]').text
         # Click on the 'dropdownMenu1 button'
         driver.find_element(By.ID, "dropdownMenu1").click()
         # Click on `Close Finding`

wsgi.py

@@ -32,4 +32,4 @@
 application = get_wsgi_application()
 
 # Preload the application code by preloading the URLs configuration
-get_resolver(ROOT_URLCONF).url_patterns
+get_resolver(ROOT_URLCONF).url_patterns  # noqa: B018