Fix a typecheck error and reformat with black

Signed-off-by: Ihor Solodrai <[email protected]>

Author: theihor

kernel_patches_daemon/__main__.py

@@ -27,7 +27,6 @@
 )
 from opentelemetry.sdk.resources import Resource
 
-
 logger: logging.Logger = logging.getLogger(__name__)
 
 

kernel_patches_daemon/branch_worker.py

@@ -71,7 +71,6 @@
 from opentelemetry import metrics
 from pyre_extensions import none_throws
 
-
 logger: logging.Logger = logging.getLogger(__name__)
 meter: metrics.Meter = metrics.get_meter("branch_worker")
 
@@ -383,7 +382,7 @@ async def send_ci_results_email(
     subject: str,
     body: str,
 ):
-    (to_list, cc_list) = ci_results_email_recipients(config, series)
+    to_list, cc_list = ci_results_email_recipients(config, series)
     in_reply_to = get_ci_base(series)["msgid"]
     await send_email(config, to_list, cc_list, subject, body, in_reply_to)
 
@@ -413,7 +412,7 @@ def reply_email_recipients(
 
     sender = msg.get("From")
     if sender is not None:
-        (_, sender_address) = email.utils.parseaddr(sender)
+        _, sender_address = email.utils.parseaddr(sender)
         if sender_address:  # parseaddr might return an emptystring
             to_list.append(sender_address)
 
@@ -459,7 +458,7 @@ async def send_pr_comment_email(
     if not cfg.enabled:
         return
 
-    (to_list, cc_list) = reply_email_recipients(
+    to_list, cc_list = reply_email_recipients(
         msg,
         allowlist=cfg.recipient_allowlist,
         denylist=cfg.recipient_denylist,
@@ -1417,7 +1416,11 @@ def expire_branches(self) -> None:
                     # that doesn't have any closed PRs
                     # with last update within defined TTL
                     pr = self.filter_closed_pr(branch)
-                    if not pr or time.time() - pr.updated_at.timestamp() > BRANCH_TTL:
+                    if (
+                        not pr
+                        or not pr.updated_at
+                        or time.time() - pr.updated_at.timestamp() > BRANCH_TTL
+                    ):
                         self.delete_branch(branch)
 
     def expire_user_prs(self) -> None:

kernel_patches_daemon/config.py

@@ -13,7 +13,6 @@
 from dataclasses import dataclass
 from typing import Dict, List, Optional
 
-
 logger = logging.getLogger(__name__)
 
 SERIES_TARGET_SEPARATOR = "=>"

kernel_patches_daemon/github_connector.py

@@ -37,9 +37,9 @@
 TOKEN_REFRESH_THRESHOLD_TIMEDELTA = timedelta(
     seconds=ACCESS_TOKEN_REFRESH_THRESHOLD_SECONDS
 )
-assert hasattr(Auth, "TOKEN_REFRESH_THRESHOLD_TIMEDELTA"), (
-    "Could not monkey patch TOKEN_REFRESH_THRESHOLD_TIMEDELTA, it may have changed upstream."
-)
+assert hasattr(
+    Auth, "TOKEN_REFRESH_THRESHOLD_TIMEDELTA"
+), "Could not monkey patch TOKEN_REFRESH_THRESHOLD_TIMEDELTA, it may have changed upstream."
 Auth.TOKEN_REFRESH_THRESHOLD_TIMEDELTA = TOKEN_REFRESH_THRESHOLD_TIMEDELTA
 
 BOT_USER_LOGIN_SUFFIX = "[bot]"
@@ -65,9 +65,9 @@ def __init__(
         app_auth: Optional[Auth.AppInstallationAuth] = None,
         http_retries: Optional[int] = None,
     ) -> None:
-        assert bool(github_oauth_token) ^ bool(app_auth), (
-            "Only one of github_oauth_token or app_auth can be set"
-        )
+        assert bool(github_oauth_token) ^ bool(
+            app_auth
+        ), "Only one of github_oauth_token or app_auth can be set"
         self.repo_name: str = os.path.basename(repo_url)
         self.base_repo_url: str = repo_url
         self.auth_type = AuthType.UNKNOWN
@@ -135,9 +135,9 @@ def __init__(
             self.user_or_org = org
             self.repo = self.git.get_organization(org).get_repo(self.repo_name)
 
-        assert self.auth_type != AuthType.UNKNOWN, (
-            "Auth type is still set to unknown... something is wrong."
-        )
+        assert (
+            self.auth_type != AuthType.UNKNOWN
+        ), "Auth type is still set to unknown... something is wrong."
 
     def __get_new_auth_token(self) -> str:
         # refresh token if needed

kernel_patches_daemon/github_sync.py

@@ -33,7 +33,6 @@
 from opentelemetry import metrics
 from pyre_extensions import none_throws
 
-
 logger: logging.Logger = logging.getLogger(__name__)
 meter: metrics.Meter = metrics.get_meter("github_sync")
 
@@ -248,7 +247,7 @@ async def sync_relevant_subject(self, subject: Subject) -> None:
             worker = self.workers[branch]
             # PR branch name == sid of the first known series
             pr_branch_name = await worker.subject_to_branch(subject)
-            (applied, _, _) = await worker.try_apply_mailbox_series(
+            applied, _, _ = await worker.try_apply_mailbox_series(
                 pr_branch_name, series
             )
             if not applied:

tests/test_branch_worker.py

@@ -64,7 +64,6 @@
 )
 from tests.common.utils import load_test_data, read_fixture, read_test_data_file
 
-
 TEST_REPO = "repo"
 TEST_REPO_URL = f"https://user:[email protected]/org/{TEST_REPO}"
 TEST_REPO_BRANCH = "test_branch"
@@ -1337,7 +1336,7 @@ def test_email_submitter_in_allowlist(self):
         ]
         expected_email = read_fixture("test_email_submitter_in_allowlist.golden")
 
-        (to_list, cc_list) = ci_results_email_recipients(config, series)
+        to_list, cc_list = ci_results_email_recipients(config, series)
         in_reply_to = get_ci_base(series)["msgid"]
         cmd, email = build_email(
             config,
@@ -1397,7 +1396,7 @@ def test_email_submitter_not_in_allowlist(self):
         ]
         expected_email = read_fixture("test_email_submitter_not_in_allowlist.golden")
 
-        (to_list, cc_list) = ci_results_email_recipients(config, series)
+        to_list, cc_list = ci_results_email_recipients(config, series)
         in_reply_to = get_ci_base(series)["msgid"]
         cmd, email = build_email(
             config,
@@ -1461,7 +1460,7 @@ def test_email_submitter_not_in_allowlist_and_allowlist_disabled(self):
             "test_email_submitter_not_in_allowlist_and_allowlist_disabled.golden"
         )
 
-        (to_list, cc_list) = ci_results_email_recipients(config, series)
+        to_list, cc_list = ci_results_email_recipients(config, series)
         in_reply_to = get_ci_base(series)["msgid"]
         cmd, email = build_email(
             config,
@@ -1484,21 +1483,21 @@ def test_reply_email_recipients(self):
         msg = parser.parsebytes(mbox.encode("utf-8"), headersonly=True)
         self.assertIsNotNone(mbox)
         denylist = [re.compile(".*@vger.kernel.org")]
-        (to_list, cc_list) = reply_email_recipients(msg, denylist=denylist)
+        to_list, cc_list = reply_email_recipients(msg, denylist=denylist)
 
         self.assertIn("[email protected]", to_list)
         self.assertEqual(len(to_list), 17)
         self.assertEqual(len(cc_list), 1)
 
         allowlist = [re.compile(".*@vger.kernel.org")]
-        (to_list, cc_list) = reply_email_recipients(msg, allowlist=allowlist)
+        to_list, cc_list = reply_email_recipients(msg, allowlist=allowlist)
         self.assertEqual(to_list, [])
         self.assertEqual(len(cc_list), 3)
 
         # test both
         allowlist = [re.compile(".*@linux.dev")]
         denylist = [re.compile(".*@gmail.com")]
-        (to_list, cc_list) = reply_email_recipients(
+        to_list, cc_list = reply_email_recipients(
             msg, allowlist=allowlist, denylist=denylist
         )
         self.assertIn("[email protected]", to_list)
@@ -1507,13 +1506,13 @@ def test_reply_email_recipients(self):
 
         # test denylist all
         denylist = [re.compile(".*")]
-        (to_list, cc_list) = reply_email_recipients(msg, denylist=denylist)
+        to_list, cc_list = reply_email_recipients(msg, denylist=denylist)
         self.assertEqual(to_list, [])
         self.assertEqual(cc_list, [])
 
         # test denylist all, but the sender
         denylist = [re.compile(".*")]
-        (to_list, cc_list) = reply_email_recipients(
+        to_list, cc_list = reply_email_recipients(
             msg, denylist=denylist, always_reply_to_author=True
         )
         self.assertEqual(to_list, ["[email protected]"])
@@ -1707,9 +1706,9 @@ async def test_forward_pr_comments(self, m: aioresponses) -> None:
             )
 
             mock_send_email.assert_called_once()
-            (_, to_list, cc_list, subject, body, in_reply_to) = (
-                mock_send_email.call_args[0]
-            )
+            _, to_list, cc_list, subject, body, in_reply_to = mock_send_email.call_args[
+                0
+            ]
 
             self.assertIn("[email protected]", to_list)
             self.assertEqual(len(to_list), 17)