Change how import error is handled

pallets-eco · Nov 23, 2024 · 70508d5 · 70508d5
1 parent a8af6dc
commit 70508d5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 18 deletions.
diff --git a/flask_admin/contrib/fileadmin/azure.py b/flask_admin/contrib/fileadmin/azure.py
@@ -8,8 +8,12 @@
     from azure.storage.blob import BlobSasPermissions
     from azure.storage.blob import BlobServiceClient
     from azure.storage.blob import generate_blob_sas
-except ImportError:
-    BlobServiceClient = None
+except ImportError as e:
+    raise Exception(
+        "Could not import `azure.storage.blob`. "
+        "Enable `azure-blob-storage` integration "
+        "by installing `flask-admin[azure-blob-storage]`"
+    ) from e
 
 from flask import redirect
 
@@ -49,26 +53,12 @@ def __init__(self, container_name, connection_string):
         :param connection_string:
             Azure Blob Storage Connection String
         """
-
-        if not BlobServiceClient:
-            raise ValueError(
-                "Could not import `azure.storage.blob`. "
-                "Enable `azure-blob-storage` integration "
-                "by installing `flask-admin[azure-blob-storage]`"
-            )
-
         self._container_name = container_name
         self._connection_string = connection_string
         self.__client = None
 
     @property
     def _client(self):
-        if BlobServiceClient is None:
-            raise ValueError(
-                "Could not import `azure.storage.blob`. "
-                "Enable `azure-blob-storage` integration "
-                "by installing `flask-admin[azure-blob-storage]`"
-            )
         if not self.__client:
             self.__client = BlobServiceClient.from_connection_string(
                 self._connection_string

diff --git a/flask_admin/tests/fileadmin/test_fileadmin_azure.py b/flask_admin/tests/fileadmin/test_fileadmin_azure.py
@@ -4,7 +4,10 @@
 
 import pytest
 
-from flask_admin.contrib.fileadmin import azure
+try:
+    from flask_admin.contrib.fileadmin import azure
+except ImportError:
+    azure = None
 
 from .test_fileadmin import Base
 
@@ -14,7 +17,7 @@ class TestAzureFileAdmin(Base.FileAdminTests):
 
     @pytest.fixture(autouse=True)
     def setup_and_teardown(self):
-        if not azure.BlobServiceClient:
+        if azure is None:
             raise SkipTest("AzureFileAdmin dependencies not installed")
 
         self._container_name = f"fileadmin-tests-{uuid4()}"