Stop using deprecated keyring backends
keyring.backend.* was deprecated in python-keyring 1.1 and we already require keyring 1.6.1. This also makes novaclient compatible with python-keyring 3.0 which removes the deprecated paths. http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=728470#10. Change-Id: I4919ac515e589fddc6044c0cd2f4cbc06c2ec91f Co-Authored-By: Sebastian Ramacher <sramacher@debian.org>
This commit is contained in:
parent
915b0a48df
commit
572f9a985e
|
@ -37,14 +37,6 @@ all_errors = ValueError
|
||||||
try:
|
try:
|
||||||
import keyring
|
import keyring
|
||||||
HAS_KEYRING = True
|
HAS_KEYRING = True
|
||||||
try:
|
|
||||||
if isinstance(keyring.get_keyring(), keyring.backend.GnomeKeyring):
|
|
||||||
import gnomekeyring
|
|
||||||
all_errors = (ValueError,
|
|
||||||
gnomekeyring.IOError,
|
|
||||||
gnomekeyring.NoKeyringDaemonError)
|
|
||||||
except Exception:
|
|
||||||
pass
|
|
||||||
except ImportError:
|
except ImportError:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue