From 572f9a985efff593ff59daa02c6b4585b1804c1a Mon Sep 17 00:00:00 2001
From: Joe Gordon <joe.gordon0@gmail.com>
Date: Mon, 25 Nov 2013 11:19:30 -0800
Subject: [PATCH] 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>
---
 novaclient/shell.py | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/novaclient/shell.py b/novaclient/shell.py
index ca0770e38..e489eafe4 100644
--- a/novaclient/shell.py
+++ b/novaclient/shell.py
@@ -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