fix: Sourcery clean-up

BoboTiG · NiklasRosenstein · commit 84a1acd75246 · 2023-03-16T14:40:29.000+01:00
diff --git a/src/github_bot_api/event.py b/src/github_bot_api/event.py
@@ -64,7 +64,7 @@ def accept_event(
 
     if not event_name or not delivery_id or not user_agent or not content_type:
         raise InvalidRequest("missing required headers")
-    if webhook_secret is not None and not (signature_1 or signature_256):
+    if webhook_secret is not None and not signature_1 and not signature_256:
         raise InvalidRequest("webhook secret is configured but no signature header was received")
 
     mime_type, parameters = get_mime_components(content_type)
diff --git a/src/github_bot_api/signature.py b/src/github_bot_api/signature.py
@@ -15,9 +15,9 @@ def compute_signature(payload: bytes, secret: bytes, algo: str = "sha256") -> st
     algo: The hash algorithm to use, must be `sha1` or `sha256`.
     """
 
-    if algo not in ("sha1", "sha256"):
-        raise ValueError(f"algo must be {{sha1, sha256}}, got {algo!r}")
-    return f"{algo}=" + hmac.new(secret, payload, algo).hexdigest()
+    if algo in {"sha1", "sha256"}:
+        return f"{algo}={hmac.new(secret, payload, algo).hexdigest()}"
+    raise ValueError(f"algo must be {{sha1, sha256}}, got {algo!r}")
 
 
 def check_signature(sig: str, payload: bytes, secret: bytes, algo: str = "sha256") -> None:
diff --git a/src/github_bot_api/token.py b/src/github_bot_api/token.py
@@ -59,7 +59,7 @@ def create_jwt(app_id: int, expires_in: int, private_key: str) -> TokenInfo:
 
     now = int(time.time())
     exp = now + expires_in
-    payload = {"iss": int(app_id), "iat": now, "exp": exp}
+    payload = {"iss": app_id, "iat": now, "exp": exp}
     token = jwt.encode(payload, private_key, algorithm="RS256")
     return TokenInfo(exp, "Bearer", token)
 
diff --git a/src/github_bot_api/webhook.py b/src/github_bot_api/webhook.py
@@ -67,9 +67,6 @@ def dispatch(self, event: Event) -> bool:
                 matched = True
                 if handler.func(event):
                     return True
-        else:
-            logger.info(
-                f'Event %r (id: %r) goes {"unhandled" if matched else "unmatched"}.', event.name, event.delivery_id
-            )
+        logger.info(f'Event %r (id: %r) goes {"unhandled" if matched else "unmatched"}.', event.name, event.delivery_id)
 
         return matched
diff --git a/src/test/__pycache__/test_app.cpython-311-pytest-7.2.2.pyc b/src/test/__pycache__/test_app.cpython-311-pytest-7.2.2.pyc
diff --git a/src/test/__pycache__/test_import.cpython-311-pytest-7.2.2.pyc b/src/test/__pycache__/test_import.cpython-311-pytest-7.2.2.pyc
