From d98263c5e833e96bb18aa28f558f80746d6936ce Mon Sep 17 00:00:00 2001 From: Nikos Kouremenos Date: Fri, 20 Oct 2006 10:14:15 +0000 Subject: [PATCH] do not do gnomekeyring.is_available check eveyrytime (only once); remove an assert --- src/common/passwords.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/common/passwords.py b/src/common/passwords.py index 15c7cf5ad..8220c6bbd 100644 --- a/src/common/passwords.py +++ b/src/common/passwords.py @@ -21,9 +21,12 @@ from common import gajim try: import gnomekeyring except ImportError: - USER_HAS_GNOMEKEYRING = False + USER_USES_GNOMEKEYRING = False else: - USER_HAS_GNOMEKEYRING = True + if gnomekeyring.is_available(): + USER_USES_GNOMEKEYRING = True + else: + USER_USES_GNOMEKEYRING = False class PasswordStorage(object): def get_password(self, account_name): @@ -85,7 +88,7 @@ storage = None def get_storage(): global storage if storage is None: # None is only in first time get_storage is called - if USER_HAS_GNOMEKEYRING and gnomekeyring.is_available(): + if USER_USES_GNOMEKEYRING: try: storage = GnomePasswordStorage() except gnomekeyring.NoKeyringDaemonError: @@ -96,7 +99,6 @@ def get_storage(): def set_storage(storage_): global storage - assert isinstance(storage, PasswordStorage) storage = storage_