nojhan/weboob-devel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

disable keyring (refs #706)

Browse source
This commit is contained in:
Romain Bignon 2011-10-10 10:43:52 +02:00
commit cdf2e86b17
1 changed files with 24 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

43
weboob/tools/value.py
View file

@ -104,7 +104,8 @@ class ValueBackendPassword(Value):
return return
try: try:
import keyring # See #706
import keyring_DISABLED
keyring.set_password(self._domain, self.id, passwd) keyring.set_password(self._domain, self.id, passwd)
except Exception: except Exception:
self._value = passwd self._value = passwd
@ -118,26 +119,30 @@ class ValueBackendPassword(Value):
return '' return ''
def get(self): def get(self):
if self._value == '' and self._domain is not None: if self._value != '' or self._domain is None:
try:
import keyring
except ImportError:
return ''
else:
passwd = keyring.get_password(self._domain, self.id)
if passwd is None:
if not self.noprompt and 'login' in self._callbacks:
self._value = self._callbacks['login'](self._domain, self)
if self._value is None:
self._value = ''
else:
self._stored = False
return self._value
else:
return passwd
else:
return self._value return self._value
try:
# See #706
import keyring_DISABLED
except ImportError:
passwd = None
else:
passwd = keyring.get_password(self._domain, self.id)
if passwd is not None:
# Password has been read in the keyring.
return passwd
# Prompt user to enter password by hand.
if not self.noprompt and 'login' in self._callbacks:
self._value = self._callbacks['login'](self._domain, self)
if self._value is None:
self._value = ''
else:
self._stored = False
return self._value
class ValueInt(Value): class ValueInt(Value):
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
kwargs['regexp'] = '^\d+$' kwargs['regexp'] = '^\d+$'