Prefer direct import over importlib

viren-nadkarni · viren-nadkarni · commit 751aed47412a · 2025-10-09T15:14:15.000+05:30
diff --git a/localstack-core/localstack/aws/handlers/logging.py b/localstack-core/localstack/aws/handlers/logging.py
@@ -1,7 +1,5 @@
 """Handlers for logging."""
 
-import contextlib
-import importlib
 import logging
 import types
 from functools import cached_property
@@ -24,12 +22,13 @@ class ExceptionLogger(ExceptionHandler):
     def __init__(self, logger=None):
         self.logger = logger or LOG
 
-        # Moto may not be available in stripped-down versions of LocalStack, like LocalStack S3 image.
-        self._moto_service_exception = types.EllipsisType
-        with contextlib.suppress(ModuleNotFoundError, AttributeError):
-            self._moto_service_exception = importlib.import_module(
-                "moto.core.exceptions"
-            ).ServiceException
+        try:
+            import moto.core.exceptions
+
+            self._moto_service_exception = moto.core.exceptions.ServiceException
+        except (ModuleNotFoundError, AttributeError):
+            # Moto may not be available in stripped-down versions of LocalStack, like LocalStack S3 image.
+            self._moto_service_exception = types.EllipsisType
 
     def __call__(
         self,
diff --git a/localstack-core/localstack/aws/handlers/service.py b/localstack-core/localstack/aws/handlers/service.py
@@ -1,6 +1,5 @@
 """A set of common handlers to parse and route AWS service requests."""
 
-import importlib
 import logging
 import traceback
 import types
@@ -158,14 +157,14 @@ class ServiceExceptionSerializer(ExceptionHandler):
     def __init__(self):
         self.handle_internal_failures = True
 
-        # Moto may not be available in stripped-down versions of LocalStack, like LocalStack S3 image.
-        self._moto_service_exception = types.EllipsisType
         try:
-            self._moto_service_exception = importlib.import_module(
-                "moto.core.exceptions"
-            ).ServiceException
+            import moto.core.exceptions
+
+            self._moto_service_exception = moto.core.exceptions.ServiceException
         except (ModuleNotFoundError, AttributeError) as exc:
+            # Moto may not be available in stripped-down versions of LocalStack, like LocalStack S3 image.
             LOG.debug("Unable to set up Moto ServiceException translation: %s", exc)
+            self._moto_service_exception = types.EllipsisType
 
     def __call__(
         self,
