From fafceee8cbf3c4d72cc6a180b0d1e4e4fdb5cfbf Mon Sep 17 00:00:00 2001 From: Kaitlin Farr Date: Fri, 28 Jul 2017 14:14:44 -0400 Subject: [PATCH] Rename barbican client import Importing the barbican client object as barbican_client and also using barbican_client as a variable name was confusing. Changes the import name to prevent confusion. Change-Id: I886f045eb56683713ab75401b5ec1669ddbb072d --- castellan/key_manager/barbican_key_manager.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/castellan/key_manager/barbican_key_manager.py b/castellan/key_manager/barbican_key_manager.py index d9e78990..a39116b2 100644 --- a/castellan/key_manager/barbican_key_manager.py +++ b/castellan/key_manager/barbican_key_manager.py @@ -41,7 +41,7 @@ from castellan.i18n import _ from castellan.key_manager import key_manager -from barbicanclient import client as barbican_client +from barbicanclient import client as barbican_client_import from barbicanclient import exceptions as barbican_exceptions from oslo_utils import timeutils from six.moves import urllib @@ -120,7 +120,7 @@ class BarbicanKeyManager(key_manager.KeyManager): verify=self.conf.barbican.verify_ssl) self._barbican_endpoint = self._get_barbican_endpoint(auth, sess) - self._barbican_client = barbican_client.Client( + self._barbican_client = barbican_client_import.Client( session=sess, endpoint=self._barbican_endpoint) self._current_context = context