From fa0417283045d3abd6e32cf7fc32e5575f8e8dea Mon Sep 17 00:00:00 2001
From: Adriane Boyd <adrianeboyd@gmail.com>
Date: Mon, 6 Mar 2023 12:25:31 +0100
Subject: [PATCH] Fix types/handling, simplify catch-all return

---
 spacy/cli/info.py | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/spacy/cli/info.py b/spacy/cli/info.py
index 290608b99..5371b5486 100644
--- a/spacy/cli/info.py
+++ b/spacy/cli/info.py
@@ -138,13 +138,11 @@ def info_installed_model_url(model: str) -> Optional[str]:
     """
     try:
         dist = importlib_metadata.distribution(model)
-        data = json.loads(dist.read_text("direct_url.json"))
-        return data["url"]
-    except importlib_metadata.PackageNotFoundError:
-        # no such package
-        return None
-    except Exception:
-        # something else, like no file or invalid JSON
+        text = dist.read_text("direct_url.json")
+        if isinstance(text, str):
+            data = json.loads(text)
+            return data["url"]
+    finally:
         return None