Merge "Stop using deprecated keyring backends"

This commit is contained in:
Jenkins 2013-12-17 15:31:58 +00:00 committed by Gerrit Code Review
commit 915442404f

View File

@ -37,14 +37,6 @@ all_errors = ValueError
try:
import keyring
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:
pass