Adjust format into f-strings

gonchik · gonchik · commit 75506cc2e5be · 2025-03-24T12:39:01.000+02:00
diff --git a/atlassian/jira.py b/atlassian/jira.py
diff --git a/atlassian/xray.py b/atlassian/xray.py
@@ -33,7 +33,7 @@ def raise_for_status(self, response):
             else:
                 raise HTTPError(error_msg, response=response)
 
-    def resource_url(self, resource: object, api_root: object = None, api_version: object = None) -> object:
+    def resource_url(self, resource, api_root=None, api_version=None):
         """
         Overloading the method from AtlassianRestAPI to be compatible with the "middle man" version used by Xray.
         """
diff --git a/examples/jira/jira_clean_inactive_or_removed_from_jira_users.py b/examples/jira/jira_clean_inactive_or_removed_from_jira_users.py
@@ -19,7 +19,7 @@
 
 for project in projects:
     project_key = project.get("key")
-    print(("Start review project {}".format(project_key)))
+    print(f"Start review project {project_key}")
     for role_id in role_ids:
         actors = jira.get_project_actors_for_role_project(project_key, role_id)
         for actor in actors:
@@ -29,5 +29,5 @@
                     continue
                 answer = jira.user(username)
                 if answer.get("errorMessages") or (not answer.get("active")):
-                    print(("Removing from project permissions {}".format(username)))
+                    print(f"Removing from project permissions {username}")
                     jira.delete_project_actors(project_key, role_id=role_id, actor=username, actor_type="user")
diff --git a/examples/jira/jira_convert_group_members_into_user_in_role.py b/examples/jira/jira_convert_group_members_into_user_in_role.py
@@ -13,7 +13,7 @@ def convert_group_into_users_in_role(project_key, role_id, group_name):
     users = jira.get_all_users_from_group(group=group_name, limit=1000).get("values")
     for user in users:
         jira.add_user_into_project_role(project_key=project_key, role_id=role_id, user_name=user.get("name"))
-        print(("{} added into role_id  {} in {}".format(user.get("name"), role_id, project_key)))
+        print(f"{user.get('name')} added into role_id  {role_id} in {project_key}")
 
 
 group_name_to_find = "old-developers"
@@ -27,5 +27,5 @@ def convert_group_into_users_in_role(project_key, role_id, group_name):
         for member in members_of_role:
             if member.get("type") == "atlassian-group-role-actor":
                 if member.get("name") == group_name_to_find:
-                    print(("{} has {}".format(project.get("key"), role.get("name"))))
+                    print(f"{project.get('key')} has {role.get('name')}")
                     convert_group_into_users_in_role(project.get("key"), role.get("id"), group_name_to_find)
diff --git a/examples/jira/jira_copy_components_from_A_to_B.py b/examples/jira/jira_copy_components_from_A_to_B.py
@@ -18,4 +18,4 @@
         "assigneeType": component.get("assigneeType"),
     }
     jira.create_component(data)
-    print(("{} - component created ".format(component.get("name"))))
+    print(f"{component.get('name')} - component created ")
diff --git a/examples/jira/jira_dc_create_support_zips.py b/examples/jira/jira_dc_create_support_zips.py
@@ -12,14 +12,14 @@
 while True:
     for task in jira.check_support_zip_status(zips_creation_task_id)["tasks"]:
         if task["status"] == "IN_PROGRESS":
-            print(("file {} {}".format(task["fileName"], task["progressMessage"])))
+            print(f"file {task['fileName']} {task['progressMessage']}")
             if task["fileName"] not in in_progress_zips:
                 in_progress_zips.append(task["fileName"])
         else:
             support_zip = jira.download_support_zip(task["fileName"])
             with open(task["fileName"], "wb") as fp:
                 fp.write(support_zip)
-            print(("{} written.".format(task["fileName"])))
+            print(f"{task['fileName']} written.")
             if task["fileName"] in in_progress_zips:
                 in_progress_zips.remove(task["fileName"])
 
diff --git a/examples/jira/jira_download_attachments.py b/examples/jira/jira_download_attachments.py
@@ -33,5 +33,5 @@
             if response.status_code != 200:
                 continue
             with open(dest_folder + "/" + filename, "wb") as f:
-                print(("Saving for {key} the file {filename}".format(key=key, filename=filename)))
+                print(f"Saving for {key} the file {filename}")
                 f.write(response.content)
diff --git a/examples/jira/jira_find_screen_similarity.py b/examples/jira/jira_find_screen_similarity.py
@@ -41,18 +41,18 @@ def extract_count(json):
         }
     )
     count_fields_per_screen.append(number_fields)
-    print(("Number of available screen fields {} for screen with name  {}".format(number_fields, screen.get("name"))))
+    print(f"Number of available screen fields {number_fields} for screen with name  {screen.get('name')}")
 
 screens.sort(key=extract_count, reverse=True)
 flipped_fields = {}
 
 print("The same screen of fields based on the count")
 for x in screens:
     if count_fields_per_screen.count(x["available_fields_count"]) > 1:
-        print(("Please, check {}/secure/admin/ConfigureFieldScreen.jspa?id={}".format(jira.url, x["screen_id"])))
+        print(f"Please, check {jira.url}/secure/admin/ConfigureFieldScreen.jspa?id={x['screen_id']}")
 
 print(("=" * 12))
 print("The same field screens based on the hash")
 for x in screens:
     if hashes.count(x["available_fields_hash"]) > 1:
-        print(("Please, check {}/secure/admin/ConfigureFieldScreen.jspa?id={}".format(jira.url, x["screen_id"])))
+        print(f"Please, check {jira.url}/secure/admin/ConfigureFieldScreen.jspa?id={x['screen_id']}")
diff --git a/examples/jira/jira_index_fixer.py b/examples/jira/jira_index_fixer.py
@@ -26,6 +26,6 @@ def deindex_issue(self, issue_id):
     index_orphant_issues = response["indexOrphans"]
     for ticket in index_orphant_issues:
         ticket_id = ticket["issueId"]
-        print(("Orphan index for ticket id = {}".format(ticket_id)))
+        print(f"Orphan index for ticket id = {ticket_id}")
         if fixer:
             s.deindex_issue(ticket_id)
diff --git a/examples/jira/jira_issue_type_counter.py b/examples/jira/jira_issue_type_counter.py
@@ -8,13 +8,13 @@
 
 for i in issue_types:
     issue_type = i["name"]
-    jql_all = 'issuetype = "{0}"'.format(issue_type)
+    jql_all = f'issuetype = "{issue_type}"'
     number = jira.jql(jql_all)["total"]
-    jql_of_category = 'issuetype = "{0}" AND category = {1}'.format(issue_type, category)
+    jql_of_category = f'issuetype = "{issue_type}" AND category = {category}'
     number_of_deprecated = jira.jql(jql_of_category)["total"]
     if number > 0:
         percent_of_deprecated = number_of_deprecated / number * 100
     else:
         percent_of_deprecated = 0
     percentage = round(percent_of_deprecated, 1)
-    print(("{0}, {1}, {2}% of {3}".format(issue_type, number, percentage, category)))
+    print((f"{issue_type}, {number}, {percentage}% of {category}"))
diff --git a/examples/jira/jira_issue_update_epic_link.py b/examples/jira/jira_issue_update_epic_link.py
@@ -12,7 +12,7 @@ def main():
     target_epic_issue_key = "ARA-1314"
     for issue_key in update_issues:
         jira.update_issue_field(issue_key, fields={epic_link_custom_field_id: target_epic_issue_key})
-        print(("updated for {}".format(issue_key)))
+        print(f"updated for {issue_key}")
     print("done")
 
 
diff --git a/examples/jira/jira_jql_fetcher_as_weekly_report.py b/examples/jira/jira_jql_fetcher_as_weekly_report.py
@@ -28,8 +28,8 @@ def __fetch_user_activity(self, user):
         flag = True
         limit = 10
         step = 0
-        jql = "((assignee was in ({})) OR assignee in ({})) AND updated > -{}d ".format(user, user, self.days)
-        print(("Start fetching info jql = {}".format(jql)))
+        jql = f"((assignee was in ({user})) OR assignee in ({user})) AND updated > -{self.days}d "
+        print(f"Start fetching info jql = {jql}")
         while flag:
             try:
                 response = self.jira.jql(
@@ -66,13 +66,7 @@ def __get_changes_of_cases(self, histories):
             ]  # person who did the change
             changes = ["Listing all items that changed:"]
             for item in history.get("items"):
-                changes.append(
-                    "{} - {}- {}".format(
-                        item["field"],
-                        item["fromString"],
-                        item["toString"],
-                    )
-                )
+                changes.append(f"{item['field']} - {item['fromString']}- {item['toString']}")
             output.append("\t".join(changes))
         return " - ".join(output)
 
@@ -89,7 +83,7 @@ def console_output(self, delimiter="|", console=True):
         number = 1
         data = []
         for case in self.cases:
-            print(("Processing case #{}".format(number)))
+            print(f"Processing case #{number}")
             output = [
                 case.get("actor"),
                 case.get("key"),
diff --git a/examples/jira/jira_oauth2.py b/examples/jira/jira_oauth2.py
@@ -63,7 +63,7 @@ def login():
 def callback():
     jira_oauth = OAuth2Session(client_id, state=session["oauth_state"], redirect_uri=redirect_uri)
     token_json = jira_oauth.fetch_token(token_url, client_secret=client_secret, authorization_response=request.url)
-    return "Token: {}<p />Projects: {}".format(token_json, ", ".join(get_projects(token_json)))
+    return f"Token: {token_json}<p />Projects: {', '.join(get_projects(token_json))}"
 
 
 """
@@ -78,7 +78,7 @@ def get_projects(token_json):
     req = requests.get(
         "https://api.atlassian.com/oauth/token/accessible-resources",
         headers={
-            "Authorization": "Bearer {}".format(token_json["access_token"]),
+            "Authorization": f"Bearer {token_json['access_token']}",
             "Accept": "application/json",
         },
     )
@@ -93,5 +93,5 @@ def get_projects(token_json):
             "token_type": "Bearer",
         },
     }
-    jira = Jira(url="https://api.atlassian.com/ex/jira/{}".format(cloud_id), oauth2=oauth2_dict)
+    jira = Jira(url=f"https://api.atlassian.com/ex/jira/{cloud_id}", oauth2=oauth2_dict)
     return [project["name"] for project in jira.projects()]
diff --git a/examples/jira/jira_project_leaders.py b/examples/jira/jira_project_leaders.py
@@ -26,10 +26,6 @@
 for project in jira.project_leaders():
     print(
         (
-            "| {project_key} | {project_name} | {lead_email_link} |".format(
-                project_key=project["project_key"],
-                project_name=project["project_name"],
-                lead_email_link=MAILTO.format(lead_name=project["lead_name"], lead_email=project["lead_email"]),
-            )
+            f"| {project['project_key']} | {project['project_name']} | {MAILTO.format(lead_name=project['lead_name'], lead_email=project['lead_email'])} |"
         )
     )
diff --git a/examples/jira/jira_review_groups.py b/examples/jira/jira_review_groups.py
@@ -74,7 +74,7 @@ def exclude_inactive_users(groups):
     """
     for group in groups:
         for user in group["users"]:
-            print(("Trying to delete {} from group {}".format(user["name"], group["group_name"])))
+            print(f"Trying to delete {user['name']} from group {group['group_name']}")
             jira.remove_user_from_group(user["name"], group["group_name"])
     return True
 
@@ -100,4 +100,4 @@ def find_group(groups, group_name):
         if group["group_name"] == group_name:
             return group
         else:
-            return "Group {} not in list".format(group_name)
+            return f"Group {group_name} not in list"
diff --git a/tests/mockup.py b/tests/mockup.py
@@ -18,7 +18,7 @@ def request_mockup(*args, **kwargs):
     method = kwargs["method"]
     url = kwargs["url"]
     if not url.startswith(SERVER + "/"):
-        raise ValueError("URL [{}] does not start with [{}/].".format(url, SERVER))
+        raise ValueError(f"URL [{url}] does not start with [{SERVER}/].")
     parts = url[len(SERVER) + 1 :].split("?")
     url = parts[0]
     response_key = parts[1] if len(parts) > 1 else None
@@ -50,9 +50,9 @@ def request_mockup(*args, **kwargs):
                         if "links" in cur_dict:
                             for link in list(cur_dict["links"].values()):
                                 for ld in link if type(link) is list else [link]:
-                                    ld["href"] = "{}/{}".format(SERVER, ld["href"])
+                                    ld["href"] = f"{SERVER}/{ld['href']}"
                 if "next" in data:
-                    data["next"] = "{}/{}".format(SERVER, data["next"])
+                    data["next"] = f"{SERVER}/{data['next']}"
 
                 response.encoding = "utf-8"
                 response._content = bytes(json.dumps(data), response.encoding)
@@ -63,12 +63,12 @@ def request_mockup(*args, **kwargs):
         response.encoding = "utf-8"
         response._content = b"{}"
         response.status_code = 404  # Not found
-        response.reason = "No stub defined [{}]".format(response_file)
+        response.reason = f"No stub defined [{response_file}]"
     except KeyError:
         response.encoding = "utf-8"
         response._content = b"{}"
         response.status_code = 404  # Not found
-        response.reason = "No stub defined for key [{}] in [{}]".format(response_key, response_file)
+        response.reason = f"No stub defined for key [{response_key}] in [{response_file}]"
 
     return response
 
diff --git a/tests/test_bitbucket_cloud_oo.py b/tests/test_bitbucket_cloud_oo.py
@@ -13,10 +13,8 @@
 try:
     from .mockup import mockup_server
 
-    BITBUCKET = Bitbucket(
-        "{}/bitbucket/cloud".format(mockup_server()), username="username", password="password", cloud=True
-    )
-    CLOUD = Cloud("{}/bitbucket/cloud".format(mockup_server()), username="username", password="password")
+    BITBUCKET = Bitbucket(f"{mockup_server()}/bitbucket/cloud", username="username", password="password", cloud=True)
+    CLOUD = Cloud(f"{mockup_server()}/bitbucket/cloud", username="username", password="password")
 except ImportError:
     pass
 
diff --git a/tests/test_bitbucket_server.py b/tests/test_bitbucket_server.py
@@ -7,9 +7,7 @@
 
 class TestWebhook(TestCase):
     def setUp(self):
-        self.bitbucket = Bitbucket(
-            "{}/bitbucket/server".format(mockup_server()), username="username", password="password"
-        )
+        self.bitbucket = Bitbucket(f"{mockup_server()}/bitbucket/server", username="username", password="password")
         self.project_key = "PRJ"
         self.repository_slug = "my-repo1-slug"
         self.webhook_id = 3
diff --git a/tests/test_bitbucket_server_oo.py b/tests/test_bitbucket_server_oo.py
@@ -10,9 +10,7 @@
 try:
     from .mockup import mockup_server
 
-    BITBUCKET = Server(
-        "{}/bitbucket/server".format(mockup_server()), username="username", password="password", cloud=True
-    )
+    BITBUCKET = Server(f"{mockup_server()}/bitbucket/server", username="username", password="password", cloud=True)
 except ImportError:
     pass
 
diff --git a/tests/test_confluence_advanced_mode.py b/tests/test_confluence_advanced_mode.py
@@ -37,7 +37,7 @@ def setUpClass(cls):
                     password=credentials["password"],
                 )
         except Exception as err:
-            raise cls.failureException("[{0}]: {1}".format(cls.secret_file, err))
+            raise cls.failureException(f"[{cls.secret_file}]: {err}")
 
         cls.space = "SAN"
         cls.created_pages = set()
@@ -79,7 +79,7 @@ def test_confluence_advanced_mode_put(self):
             "body": {"editor": {"value": "<h1>Updated page</h1>", "representation": "editor"}},
         }
 
-        result = self.confluence.put(path="/rest/api/content/{0}".format(page_id), data=data, advanced_mode=True)
+        result = self.confluence.put(path=f"/rest/api/content/{page_id}", data=data, advanced_mode=True)
         self.assertIsInstance(result, Response)
 
     def test_confluence_advanced_mode_delete(self):
@@ -89,9 +89,7 @@ def test_confluence_advanced_mode_delete(self):
         page_id = self.confluence.create_page(
             space=self.space, title=page_title, body="h1. Test content\n", representation="wiki"
         )["id"]
-        response = self.confluence.delete(
-            path="rest/api/content/{page_id}".format(page_id=page_id), params={}, advanced_mode=True
-        )
+        response = self.confluence.delete(path=f"rest/api/content/{page_id}", params={}, advanced_mode=True)
         self.assertIsInstance(response, Response)
 
     def tearDown(self):
diff --git a/tests/test_confluence_attach.py b/tests/test_confluence_attach.py
@@ -30,7 +30,7 @@ def test_confluence_attach_file_1(self):
             with open(self.secret_file) as json_file:
                 credentials = json.load(json_file)
         except Exception as err:
-            self.fail("[{0}]: {1}".format(self.secret_file, err))
+            self.fail(f"[{self.secret_file}]: {err}")
 
         confluence = Confluence(
             url=credentials["host"],
@@ -75,7 +75,7 @@ def test_confluence_attach_file_2(self):
             with open(self.secret_file) as json_file:
                 credentials = json.load(json_file)
         except Exception as err:
-            self.fail("[{0}]: {1}".format(self.secret_file, err))
+            self.fail(f"[{self.secret_file}]: {err}")
 
         confluence = Confluence(
             url=credentials["host"],
@@ -136,7 +136,7 @@ def test_confluence_attach_content(self):
             with open(self.secret_file) as json_file:
                 credentials = json.load(json_file)
         except Exception as err:
-            self.fail("[{0}]: {1}".format(self.secret_file, err))
+            self.fail(f"[{self.secret_file}]: {err}")
 
         confluence = Confluence(
             url=credentials["host"],
diff --git a/tests/test_jira.py b/tests/test_jira.py
@@ -8,7 +8,7 @@
 
 class TestJira(TestCase):
     def setUp(self):
-        self.jira = jira.Jira("{}/jira".format(mockup_server()), username="username", password="password", cloud=True)
+        self.jira = jira.Jira(f"{mockup_server()}/jira", username="username", password="password", cloud=True)
 
     def test_get_issue(self):
         """Can retrieve an Issue by ID"""
diff --git a/tests/test_servicedesk.py b/tests/test_servicedesk.py
@@ -9,9 +9,7 @@
 try:
     from .mockup import mockup_server
 
-    SERVICEDESK = ServiceDesk(
-        "{}/servicedesk".format(mockup_server()), username="username", password="password", cloud=True
-    )
+    SERVICEDESK = ServiceDesk(f"{mockup_server()}/servicedesk", username="username", password="password", cloud=True)
 except ImportError:
     pass
 

Original file line number	Diff line number	Diff line change
`@@ -18,4 +18,4 @@`
`18`	`18`	`"assigneeType": component.get("assigneeType"),`
`19`	`19`	`}`
`20`	`20`	`jira.create_component(data)`
`21`		`- print(("{} - component created ".format(component.get("name"))))`
	`21`	`+ print(f"{component.get('name')} - component created ")`