From acbcdc9b8cb54f9e1a53939323b8e4a2aa7beb69 Mon Sep 17 00:00:00 2001
From: Clay Gerrard <clay.gerrard@gmail.com>
Date: Thu, 9 May 2024 14:09:40 -0500
Subject: [PATCH] import exceptions "correctly"
Change-Id: Ie7da4369152aa5d571a8c834da7390c518143c84
---
swift/common/utils/logs.py | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/swift/common/utils/logs.py b/swift/common/utils/logs.py
index 3a69f4b720..3e918a34e4 100644
--- a/swift/common/utils/logs.py
+++ b/swift/common/utils/logs.py
@@ -35,7 +35,14 @@ import datetime
from swift.common.utils.base import md5, quote, split_path
from swift.common.utils.timestamp import UTC
from swift.common.utils.config import config_true_value
-from swift.common import statsd_client, exceptions
+from swift.common import statsd_client
+# common.utils imports a fully qualified common.exceptions so that
+# common.exceptions can import common.utils with out a circular import error
+# (if we only make reference to attributes of a module w/i our function/method
+# bodies fully qualifed module names can have their attributes lazily
+# evaluated); as the only other module with-in utils that imports exceptions:
+# we do the same here
+import swift.common.exceptions
if six.PY2:
from eventlet.green import httplib as green_http_client
@@ -351,7 +358,7 @@ class LogAdapter(logging.LoggerAdapter, object):
if hasattr(exc, 'created_at'):
detail += ' after %0.2fs' % (time.time() - exc.created_at)
emsg += ' (%s)' % detail
- if isinstance(exc, exceptions.MessageTimeout):
+ if isinstance(exc, swift.common.exceptions.MessageTimeout):
if exc.msg:
emsg += ' %s' % exc.msg
else: