From a5243fc130d36aa48dcced4017f499b35a4a1fbb Mon Sep 17 00:00:00 2001
From: Ricardo Branco <rbranco@suse.de>
Date: Sat, 28 Oct 2023 20:56:29 +0200
Subject: [PATCH] Simplify blame_file()

---
 gitblame.py | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/gitblame.py b/gitblame.py
index a97863f..bd7b1c9 100644
--- a/gitblame.py
+++ b/gitblame.py
@@ -106,17 +106,14 @@ def blame_file(self, file: str) -> dict | None:
                     time.sleep(wait_time)
                     continue
                 response.raise_for_status()
-                try:
-                    data = response.json()["data"]
-                except KeyError:
-                    logging.error("%s: %s: %s", file, response.text, response.headers)
-                    return None
-                return data["repositoryOwner"]["repository"]["object"]["blame"][
-                    "ranges"
-                ]
+                data = response.json()["data"]
             except RequestException as exc:
                 logging.error("%s: %s", file, exc)
                 return None
+            except KeyError:
+                logging.error("%s: %s: %s", file, response.text, response.headers)
+                return None
+            return data["repositoryOwner"]["repository"]["object"]["blame"]["ranges"]
         return None
 
     def blame_line(self, file: str, line: int) -> tuple[str, str, str, datetime]: