openstack
/
python-openstackclient
Code Issues Proposed changes

Fix keyring issue where there were name space problems 

The import of keyring conflicted with a string named keyring

Change-Id: I7416ea1cf453a126dd03dba8bc2900cad35ed2da
Closes-bug: #1271987
This commit is contained in:
Terry Howe 2014-01-23 09:33:06 -07:00
parent 9e9bbad120
commit bc2395eb47
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openstackclient/common/openstackkeyring.py
View File

@ -56,5 +56,5 @@ class OpenstackKeyring(keyring.backends.file.BaseKeyring):
def os_keyring():
"""Initialize the openstack keyring."""
keyring = 'openstackclient.common.openstackkeyring.OpenstackKeyring'
return keyring.core.load_keyring(None, keyring)
ring = 'openstackclient.common.openstackkeyring.OpenstackKeyring'
return keyring.core.load_keyring(None, ring)