From 3c32c6894bb23f53601bc071632567684af4b175 Mon Sep 17 00:00:00 2001 From: Alejandro Cabrera Date: Tue, 19 Nov 2013 10:43:19 -0500 Subject: [PATCH] fix: import-time side effect on errors A subtle module mismatch occurs when importing: from marconiclient.transport import errors This actually brings in marconiclient.errors, rather than the expected marconiclient.transport.errors. This patch addresses the issue, which was caused by import-time side effects in marconiclient.transport.__init__. Change-Id: I2209193fc81099b1af3e0fc174b254cdfcfc619a --- marconiclient/transport/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/marconiclient/transport/__init__.py b/marconiclient/transport/__init__.py index 617059a0..2e7212ef 100644 --- a/marconiclient/transport/__init__.py +++ b/marconiclient/transport/__init__.py @@ -18,7 +18,7 @@ import six from six.moves.urllib import parse from stevedore import driver -from marconiclient import errors +from marconiclient import errors as _errors _TRANSPORT_OPTIONS = [ cfg.StrOpt('default_transport', default='http', @@ -51,7 +51,7 @@ def get_transport(conf, transport, version=1): invoke_on_load=True, invoke_args=[conf]) except RuntimeError as ex: - raise errors.DriverLoadFailure(entry_point, ex) + raise _errors.DriverLoadFailure(entry_point, ex) return mgr.driver