Ruff: Add and fix PLR6104 (#11716)

Author: kiblik

dojo/benchmark/views.py

@@ -118,9 +118,7 @@ def return_score(queryset):
     for item in queryset:
         if item["pass_fail"]:
             asvs_level_1_score = item["pass_fail__count"]
-        asvs_level_1_benchmark = (
-            asvs_level_1_benchmark + item["pass_fail__count"]
-        )
+        asvs_level_1_benchmark += item["pass_fail__count"]
 
     return asvs_level_1_benchmark, asvs_level_1_score
 

dojo/filters.py

@@ -334,8 +334,7 @@ def __init__(self, *args, **kwargs):
                 # we defer applying the select2 autocomplete because there can be multiple forms on the same page
                 # and form.js would then apply select2 multiple times, resulting in duplicated fields
                 # the initialization now happens in filter_js_snippet.html
-                self.form.fields[field].widget.tag_options = \
-                    self.form.fields[field].widget.tag_options + tagulous.models.options.TagOptions(autocomplete_settings={"width": "200px", "defer": True})
+                self.form.fields[field].widget.tag_options += tagulous.models.options.TagOptions(autocomplete_settings={"width": "200px", "defer": True})
                 tagged_model, exclude = get_tags_model_from_field_name(field)
                 if tagged_model:  # only if not the normal tags field
                     self.form.fields[field].label = get_tags_label_from_model(tagged_model)
@@ -1592,7 +1591,7 @@ def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
     def filter_percentage(self, queryset, name, value):
-        value = value / decimal.Decimal("100.0")
+        value /= decimal.Decimal("100.0")
         # Provide some wiggle room for filtering since the UI rounds to two places (and because floats):
         # a user may enter 0.15, but we'll return everything in [0.0015, 0.0016).
         # To do this, add to our value 1^(whatever the exponent for our least significant digit place is), but ensure

dojo/finding/views.py

@@ -1379,9 +1379,9 @@ def defect_finding_review(request, fid):
             # Add the closing note
             if push_to_jira and not finding_in_group:
                 if defect_choice == "Close Finding":
-                    new_note.entry = new_note.entry + "\nJira issue set to resolved."
+                    new_note.entry += "\nJira issue set to resolved."
                 else:
-                    new_note.entry = new_note.entry + "\nJira issue re-opened."
+                    new_note.entry += "\nJira issue re-opened."
                 jira_helper.add_comment(finding, new_note, force_push=True)
             # Save the finding
             finding.save(push_to_jira=(push_to_jira and not finding_in_group))

dojo/metrics/utils.py

@@ -433,7 +433,7 @@ def get_charting_data(
     if period == MetricsPeriod.WEEK:
         # For weeks, start at the first day of the specified week
         start_date = datetime(start_date.year, start_date.month, start_date.day, tzinfo=tz)
-        start_date = start_date + timedelta(days=-start_date.weekday())
+        start_date += timedelta(days=-start_date.weekday())
     else:
         # For months, start on the first day of the month
         start_date = datetime(start_date.year, start_date.month, 1, tzinfo=tz)

dojo/models.py

@@ -857,11 +857,11 @@ def calc_health(self):
         health = 100
         if c_findings.count() > 0:
             health = 40
-            health = health - ((c_findings.count() - 1) * 5)
+            health -= ((c_findings.count() - 1) * 5)
         if h_findings.count() > 0:
             if health == 100:
                 health = 60
-            health = health - ((h_findings.count() - 1) * 2)
+            health -= ((h_findings.count() - 1) * 2)
         if health < 5:
             return 5
         return health
@@ -2835,16 +2835,16 @@ def compute_hash_code(self):
             if hashcodeField == "endpoints":
                 # For endpoints, need to compute the field
                 myEndpoints = self.get_endpoints()
-                fields_to_hash = fields_to_hash + myEndpoints
+                fields_to_hash += myEndpoints
                 deduplicationLogger.debug(hashcodeField + " : " + myEndpoints)
             elif hashcodeField == "vulnerability_ids":
                 # For vulnerability_ids, need to compute the field
                 my_vulnerability_ids = self.get_vulnerability_ids()
-                fields_to_hash = fields_to_hash + my_vulnerability_ids
+                fields_to_hash += my_vulnerability_ids
                 deduplicationLogger.debug(hashcodeField + " : " + my_vulnerability_ids)
             else:
                 # Generically use the finding attribute having the same name, converts to str in case it's integer
-                fields_to_hash = fields_to_hash + str(getattr(self, hashcodeField))
+                fields_to_hash += str(getattr(self, hashcodeField))
                 deduplicationLogger.debug(hashcodeField + " : " + str(getattr(self, hashcodeField)))
         deduplicationLogger.debug("compute_hash_code - fields_to_hash = " + fields_to_hash)
         return self.hash_fields(fields_to_hash)

dojo/settings/settings.dist.py

@@ -884,7 +884,7 @@ def generate_url(scheme, double_slashes, user, password, host, port, path, param
         # https://warehouse.python.org/project/whitenoise/
         "whitenoise.middleware.WhiteNoiseMiddleware",
     ]
-    MIDDLEWARE = MIDDLEWARE + WHITE_NOISE
+    MIDDLEWARE += WHITE_NOISE
 
 EMAIL_CONFIG = env.email_url(
     "DD_EMAIL_URL", default="smtp://user@:password@localhost:25")

dojo/survey/views.py

@@ -789,7 +789,7 @@ def answer_empty_survey(request, esid):
             survey.responder = request.user if not request.user.is_anonymous else None
             survey.answered_on = date.today()
             survey.save()
-            general_survey.num_responses = general_survey.num_responses + 1
+            general_survey.num_responses += 1
             general_survey.save()
             if request.user.is_anonymous:
                 message = "Your responses have been recorded."

dojo/templatetags/announcement_banner_tags.py

@@ -9,7 +9,7 @@
 @register.filter
 def bleach_announcement_message(message):
     allowed_attributes = bleach.ALLOWED_ATTRIBUTES
-    allowed_attributes["a"] = allowed_attributes["a"] + ["style", "target"]
+    allowed_attributes["a"] += ["style", "target"]
     return mark_safe(bleach.clean(
         message,
         attributes=allowed_attributes,

dojo/templatetags/get_banner.py

@@ -17,7 +17,7 @@ def get_banner_conf(attribute):
             if attribute == "banner_message":
                 # only admin can edit login banner, so we allow html, but still bleach it
                 allowed_attributes = bleach.ALLOWED_ATTRIBUTES
-                allowed_attributes["a"] = allowed_attributes["a"] + ["style", "target"]
+                allowed_attributes["a"] += ["style", "target"]
                 return mark_safe(bleach.clean(
                     value,
                     attributes=allowed_attributes,

dojo/tools/api_bugcrowd/api_client.py

@@ -136,7 +136,7 @@ def test_product_connection(self, api_scan_configuration):
             api_scan_configuration.service_key_2,
         )
         for page in submission_gen:
-            submissions = submissions + page
+            submissions += page
         submission_number = len(submissions)
         return (
             f'You have access to "{submission_number}" submissions (no duplicates)'