f-stringify part 2

gonchik · gonchik · commit 730f79e24417 · 2025-03-22T00:22:57.000+02:00
diff --git a/examples/bamboo/bamboo_label_based_cleaner.py b/examples/bamboo/bamboo_label_based_cleaner.py
@@ -31,30 +31,28 @@ def get_plans_from_project(project_key):
 if __name__ == "__main__":
     bamboo = Bamboo(url=BAMBOO_URL, username=BAMBOO_LOGIN, password=BAMBOO_PASSWORD, timeout=180)
     projects = get_all_projects()
-    print(("Start analyzing the {} projects".format(len(projects))))
+    print((f"Start analyzing the {len(projects)} projects"))
     for project in projects:
-        print(("Inspecting {} project".format(project)))
+        print((f"Inspecting {project} project"))
         plans = get_plans_from_project(project)
-        print(("Start analyzing the {} plans".format(len(plans))))
+        print((f"Start analyzing the {len(plans)} plans"))
         for plan in plans:
-            print(("Inspecting {} plan".format(plan)))
+            print((f"Inspecting {plan} plan"))
             build_results = [
                 x for x in bamboo.results(plan_key=plan, label=LABEL, max_results=100, include_all_states=True)
             ]
             for build in build_results:
                 build_key = build.get("buildResultKey") or None
-                print(("Inspecting {} build".format(build_key)))
+                print((f"Inspecting {build_key} build"))
                 build_value = bamboo.build_result(build_key)
                 build_complete_time = build_value.get("buildCompletedTime") or None
                 if not build_complete_time:
                     continue
                 datetimeObj = datetime.strptime(build_complete_time.split("+")[0] + "000", "%Y-%m-%dT%H:%M:%S.%f")
                 if datetime.now() > datetimeObj + timedelta(days=OLDER_DAYS):
                     print((
-                        "Build is old {} as build complete date {}".format(
-                            build_key, build_complete_time.strftime("%Y-%m-%d")
-                        )
+                        f"Build is old {build_key} as build complete date {build_complete_time.strftime('%Y-%m-%d')}"
                     ))
                     if not DRY_RUN:
-                        print(("Removing {} build".format(build_key)))
+                        print((f"Removing {build_key} build"))
                         bamboo.delete_build_result(build_key)
diff --git a/examples/bamboo/bamboo_remove_old_failed_results.py b/examples/bamboo/bamboo_remove_old_failed_results.py
@@ -43,20 +43,20 @@ def remove_build_result(build_key, status):
     datetime_obj = datetime.strptime(build_complete_time.split("+")[0] + "000", "%Y-%m-%dT%H:%M:%S.%f")
     if datetime.now() > datetime_obj + timedelta(days=OLDER_DAYS):
         if build_value.get("buildState") == status:
-            print(("Removing build result - {}".format(build_key)))
+            print((f"Removing build result - {build_key}"))
             if not DRY_RUN:
                 bamboo.delete_build_result(build_key=build_key)
 
 
 def project_review(plans):
     for plan in plans:
-        print(("Inspecting {} plan".format(plan)))
+        print((f"Inspecting {plan} plan"))
         branches = get_branches_from_plan(plan)
         for branch in branches:
             build_results = get_results_from_branch(branch)
             for build in build_results:
                 build_key = build.get("buildResultKey") or None
-                print(("Inspecting build - {}".format(build_key)))
+                print((f"Inspecting build - {build_key}"))
                 if build_key:
                     for status in STATUS_CLEANED_RESULTS:
                         remove_build_result(build_key=build_key, status=status)
@@ -68,7 +68,7 @@ def project_review(plans):
     for project in projects:
         if project in EXCLUDED_PROJECTS:
             continue
-        print(("Inspecting project - {}".format(project)))
+        print((f"Inspecting project - {project}"))
         results = []
         all_plans_of_project = get_plans_from_project(project)
         project_review(plans=all_plans_of_project)
diff --git a/examples/bamboo/bamboo_remove_unknown_status_build_results.py b/examples/bamboo/bamboo_remove_unknown_status_build_results.py
@@ -35,20 +35,20 @@ def get_results_from_branch(plan_key):
 def remove_build_result(build_key, status):
     result = bamboo.build_result(build_key=build_key)
     if result.get("buildState") == status:
-        print(("Removing build result - {}".format(build_key)))
+        print(f"Removing build result - {build_key}")
         if REMOVE:
             bamboo.delete_build_result(build_key=build_key)
 
 
 def project_review(plans):
     for plan in plans:
-        print(("Inspecting {} plan".format(plan)))
+        print((f"Inspecting {plan} plan"))
         branches = get_branches_from_plan(plan)
         for branch in branches:
             build_results = get_results_from_branch(branch)
             for build in build_results:
                 build_key = build.get("buildResultKey") or None
-                print(("Inspecting build - {}".format(build_key)))
+                print(f"Inspecting build - {build_key}")
                 if build_key:
                     for status in STATUS_CLEANED_RESULTS:
                         remove_build_result(build_key=build_key, status=status)
@@ -60,7 +60,7 @@ def project_review(plans):
     for project in projects:
         if project in EXCLUDED_PROJECTS:
             continue
-        print(("Inspecting project - {}".format(project)))
+        print(f"Inspecting project - {project}")
         results = []
         all_plans_of_project = get_plans_from_project(project)
         project_review(plans=all_plans_of_project)
diff --git a/examples/bamboo/bamboo_trigger_builds_console_app.py b/examples/bamboo/bamboo_trigger_builds_console_app.py
@@ -25,9 +25,9 @@ def execute_build(build_key, params):
     params: dict
     """
     started_build = bamboo.execute_build(build_key, **params)
-    logging.info("Build execution status: {}".format(started_build.status_code))
+    logging.info(f"Build execution status: {started_build.status_code}")
     if started_build.status_code == 200:
-        logging.info("Build key: {}".format(started_build.json().get("buildResultKey")))
+        logging.info(f"Build key: {started_build.json().get('buildResultKey')}")
         logging.info(started_build.json().get("link", {}).get("href"))
     else:
         logging.error("Execution failed!")
diff --git a/examples/bitbucket/bitbucket_check_last_auth_users.py b/examples/bitbucket/bitbucket_check_last_auth_users.py
@@ -25,11 +25,11 @@ def report(all=False, non_auth=False, limit=20):
         else:
             full_date = None
         if full_date:
-            output = "{} ({}) authenticated on {}".format(user.get("displayName"), user.get("emailAddress"), full_date)
+            output = f"{user.get('displayName')} ({user.get('emailAddress')}) authenticated on {full_date}"
             if all:
                 print(output)
         else:
-            output = "{} ({}) not authenticated yet".format(user.get("displayName"), user.get("emailAddress"))
+            output = f"{user.get('displayName')} ({user.get('emailAddress')}) not authenticated yet"
             if non_auth or all:
                 print(output)
 
diff --git a/examples/bitbucket/bitbucket_clean_jira_branches.py b/examples/bitbucket/bitbucket_clean_jira_branches.py
@@ -96,7 +96,7 @@ def is_can_removed_branch(branch_candidate):
                             name=display_id,
                             end_point=branch["latestCommit"],
                         )
-                    log.write("{},{},{}\n".format(display_id, last_date_commit, True))
+                    log.write(f"{display_id},{last_date_commit},{True}\n")
             step += 1
     log.close()
     print("Done")
diff --git a/examples/bitbucket/bitbucket_manage_pull_request.py b/examples/bitbucket/bitbucket_manage_pull_request.py
@@ -6,21 +6,21 @@
 
 pr = bitbucket.get_pullrequest("project_name", "repository_name", pr_id)
 ver = pr.json().get("version")
-print(("PR version: {}".format(ver)))
+print(f"PR version: {ver}")
 
 response = bitbucket.decline_pull_request("project_name", "repository_name", pr_id, ver)
-print(("Declined: {}".format(response)))
+print(f"Declined: {response}")
 ver = response.json().get("version")
-print(("PR version: {}".format(ver)))
+print(f"PR version: {ver}")
 
 response = bitbucket.reopen_pull_request("project_name", "repository_name", pr_id, ver)
-print(("Reopen: {}".format(response)))
+print(f"Reopen: {response}")
 ver = response.json().get("version")
-print(("PR version: {}".format(ver)))
+print(f"PR version: {ver}")
 
 response = bitbucket.is_pull_request_can_be_merged("project_name", "repository_name", pr_id)
-print(("Reopen: {}".format(response)))
-print(("PR version: {}".format(ver)))
+print(f"Reopen: {response}")
+print(f"PR version: {ver}")
 
 response = bitbucket.merge_pull_request("project_name", "repository_name", pr_id, ver)
-print(("Merged: {}".format(response)))
+print(f"Merged: {response}")
diff --git a/examples/bitbucket/bitbucket_oauth2.py b/examples/bitbucket/bitbucket_oauth2.py
@@ -43,7 +43,7 @@ def callback():
     bitbucket = OAuth2Session(client_id, state=session["oauth_state"])
     token = bitbucket.fetch_token(token_url, client_secret=client_secret, authorization_response=request.url)
 
-    return "Token: {}<p />Workspaces: {}".format(token, ", ".join(get_workspaces(token)))
+    return f"Token: {token}<p />Workspaces: {', '.join(get_workspaces(token))}"
 
 
 # 4. Token used for Bitbucket Python API
diff --git a/examples/bitbucket/stash_user_auth_report.py b/examples/bitbucket/stash_user_auth_report.py
@@ -29,9 +29,7 @@ def report(limit=200, include_in_active=False):
         else:
             full_date = None
         if include_in_active or user.get("active"):
-            output = "|{}|{}|{}|{}|".format(
-                user.get("active"), user.get("displayName"), user.get("emailAddress"), full_date
-            )
+            output = f"|{user.get('active')}|{user.get('displayName')}|{user.get('emailAddress')}|{full_date}|"
             print(output)
 
 
diff --git a/examples/confluence/confluence_attach_file_as_link.py b/examples/confluence/confluence_attach_file_as_link.py
@@ -18,12 +18,10 @@
 
 confluence.attach_file(filename, page_id="123456789")
 
-link = """<p>
+link = f"""<p>
   <ac:link>
-    <ri:attachment ri:filename="{}"/>
+    <ri:attachment ri:filename="{filename}"/>
   </ac:link>
-</p>""".format(
-    filename
-)
+</p>"""
 
 confluence.append_page(123456789, "Page Title", link)
diff --git a/examples/confluence/confluence_check_unknown_attachment_error.py b/examples/confluence/confluence_check_unknown_attachment_error.py
@@ -33,7 +33,7 @@ def check_unknown_attachment_in_space(space_key):
     :return:
     """
     page_ids = get_all_pages_ids(space_key)
-    print(("Start review pages {} in {}".format(len(page_ids), space_key)))
+    print(f"Start review pages {len(page_ids)} in {space_key}")
     for page_id in page_ids:
         link = confluence.has_unknown_attachment_error(page_id)
         if len(link) > 0:
@@ -43,5 +43,5 @@ def check_unknown_attachment_in_space(space_key):
 if __name__ == "__main__":
     space_list = confluence.get_all_spaces()
     for space in space_list:
-        print(("Start review {} space".format(space["key"])))
+        print(f"Start review {space['key']} space")
         check_unknown_attachment_in_space(space["key"])
diff --git a/examples/confluence/confluence_draft_page_cleaner.py b/examples/confluence/confluence_draft_page_cleaner.py
@@ -46,11 +46,11 @@ def clean_all_draft_pages_from_all_spaces(days=30):
         if space_lists and len(space_lists) != 0:
             i += 1
             for space_list in space_lists:
-                print(("Start review the space {}".format(space_list["key"])))
+                print(f"Start review the space {space_list['key']}")
                 count = clean_draft_pages_from_space(space_key=space_list["key"], count=count, date_now=date_now)
         else:
             flag = False
-    print(("Script has removed {count} draft pages older than {days} days".format(count=count, days=days)))
+    print(f"Script has removed {count} draft pages older than {days} days")
 
 
 if __name__ == "__main__":
diff --git a/examples/confluence/confluence_nested_error.py b/examples/confluence/confluence_nested_error.py
@@ -11,6 +11,6 @@
     )
     result = confluence.get_user_details_by_username(username="gonchik.tsymzhitov", expand="status")
 except ApiError as e:
-    print(("FAILURE: {}, caused by {}".format(e, e.reason if e.reason is not None else "unknown reason")))
+    print(f"FAILURE: {e}, caused by {e.reason if e.reason is not None else 'unknown reason'}")
 else:
     print(result)
diff --git a/examples/confluence/confluence_page_versions_cleaner.py b/examples/confluence/confluence_page_versions_cleaner.py
@@ -14,10 +14,7 @@ def page_version_remover(content_id, remained_page_numbers):
     latest_version_count = int(response.get("lastUpdated").get("number"))
     if len(response) > 0 and latest_version_count > remained_page_numbers:
         print((
-            "Number of {} latest version {}".format(
-                confluence.url_joiner(confluence.url, "/pages/viewpage.action?pageId=" + content_id),
-                latest_version_count,
-            )
+            f"Number of {confluence.url_joiner(confluence.url, '/pages/viewpage.action?pageId=' + content_id)} latest version {latest_version_count}"
         ))
         for version_page_counter in range(1, (latest_version_count - remained_page_numbers + 1), 1):
             confluence.remove_content_history(content_id, 1)
@@ -45,7 +42,7 @@ def get_all_page_ids_from_space(space):
             for value in values:
                 print(("Retrieve page with title: " + value["title"]))
                 content_ids.append((value["id"]))
-    print(("Found in space {} pages {}".format(space, len(content_ids))))
+    print(f"Found in space {space} pages {len(content_ids)}")
     return content_ids
 
 
@@ -82,7 +79,7 @@ def reduce_page_numbers(page_id, remained_page_history_count):
     space_keys = get_all_spaces()
     counter = 0
     for space_key in space_keys:
-        print(("Starting review space with key {}".format(space_key)))
+        print(f"Starting review space with key {space_key}")
         page_ids = get_all_page_ids_from_space(space_key)
         for page_id in page_ids:
             reduce_page_numbers(page_id=page_id, remained_page_history_count=REMAINED_PAGE_HISTORY_COUNT)
diff --git a/examples/confluence/confluence_search_cql.py b/examples/confluence/confluence_search_cql.py
@@ -16,7 +16,7 @@ def search_word(word):
     :param word:
     :return: json answer
     """
-    cql = "siteSearch ~ {} order by created".format(word)
+    cql = f"siteSearch ~ {word} order by created"
     answers = confluence.cql(cql)
     for answer in answers.get("results"):
         print(answer)
@@ -29,7 +29,7 @@ def search_word_in_space(space, word):
     :param word:
     :return: json answer
     """
-    cql = "space.key={} and (text ~ {})".format(space, word)
+    cql = f"space.key={space} and (text ~ {word})"
     answers = confluence.cql(cql, expand="space,body.view")
     for answer in answers.get("results"):
         print(answer)
diff --git a/examples/confluence/confluence_trash_cleaner.py b/examples/confluence/confluence_trash_cleaner.py
@@ -18,9 +18,9 @@ def clean_pages_from_space(space_key, limit=500):
         values = confluence.get_all_pages_from_space_trash(space=space_key, start=0, limit=limit, content_type="page")
         if not values or len(values) == 0:
             flag = False
-            print(("For space {} trash is empty".format(space_key)))
+            print(f"For space {space_key} trash is empty")
         else:
-            print(("Found in space {} pages as trashed {}".format(space_key, len(values))))
+            print(f"Found in space {space_key} pages as trashed {len(values)}")
             for value in values:
                 print(("Removing page with title: " + value["title"]))
                 confluence.remove_page_from_trash(value["id"])
@@ -39,13 +39,13 @@ def clean_blog_posts_from_space(space_key, limit=500):
             space=space_key, start=0, limit=limit, content_type="blogpost"
         )
         if values and len(values) > 0:
-            print(("Found in space {} pages as trashed {}".format(space_key, len(values))))
+            print(f"Found in space {space_key} pages as trashed {len(values)}")
             for value in values:
                 print(("Removing page with title: " + value["title"]))
                 confluence.remove_page_from_trash(value["id"])
         else:
             flag = False
-            print(("For space {} trash is empty".format(space_key)))
+            print(f"For space {space_key} trash is empty")
 
 
 def clean_all_trash_pages_from_all_spaces():
diff --git a/examples/jira/jira_add_components_to_all_projects.py b/examples/jira/jira_add_components_to_all_projects.py
@@ -11,10 +11,10 @@
 
 for i in jira.get_all_projects(included_archived=None):
     if i["key"] in project_to_skip:
-        print(("Skipping project {} ".format(i["key"])))
+        print((f"Skipping project {i['key']} "))
     else:
         for j in components:
-            print(("Creating in project {} ".format(i["key"])))
+            print((f"Creating in project {i['key']} "))
             comp = {"project": i["key"], "name": j}
             jira.create_component(comp)
-            print(("{} - component created ".format(comp.get("name"))))
+            print((f"{comp.get('name')} - component created "))

Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ def is_can_removed_branch(branch_candidate):`
`96`	`96`	`name=display_id,`
`97`	`97`	`end_point=branch["latestCommit"],`
`98`	`98`	`)`
`99`		`- log.write("{},{},{}\n".format(display_id, last_date_commit, True))`
	`99`	`+ log.write(f"{display_id},{last_date_commit},{True}\n")`
`100`	`100`	`step += 1`
`101`	`101`	`log.close()`
`102`	`102`	`print("Done")`