Avoid raising exceptions when transactions are not found, just return
no cookies or empty dicts with no transactions in them.
Signed-off-by: Simo Sorce <simo@redhat.com>
Reviewed-by: Patrick Uiterwijk <puiterwijk@redhat.com>
data = self.retrieve()
if data and 'provider' in data:
self.provider = data['provider']
data = self.retrieve()
if data and 'provider' in data:
self.provider = data['provider']
else:
data = {'provider': self.provider,
'origintime': str(datetime.now())}
else:
data = {'provider': self.provider,
'origintime': str(datetime.now())}
data = {self.transaction_id: cookiedata}
self._ts.save_unique_data(TRANSTABLE, data)
data = {self.transaction_id: cookiedata}
self._ts.save_unique_data(TRANSTABLE, data)
- def _get_cookie(self):
- data = self.retrieve()
- if 'cookie' not in data:
+ def _get_cookie(self, data=None):
+ if data is None:
+ data = self.retrieve()
+ if data is None or 'cookie' not in data:
raise ValueError('Cookie name not available')
self.cookie = SecureCookie(data['cookie'])
self.cookie.receive()
raise ValueError('Cookie name not available')
self.cookie = SecureCookie(data['cookie'])
self.cookie.receive()
raise ValueError('Missing or invalid cookie')
def _del_cookie(self):
raise ValueError('Missing or invalid cookie')
def _del_cookie(self):
+ if self.cookie:
+ self.cookie.delete()
def wipe(self):
if not self.transaction_id:
def wipe(self):
if not self.transaction_id:
def retrieve(self):
data = self._ts.get_unique_data(TRANSTABLE,
uuidval=self.transaction_id)
def retrieve(self):
data = self._ts.get_unique_data(TRANSTABLE,
uuidval=self.transaction_id)
- return data.get(self.transaction_id)
+ return data.get(self.transaction_id) or dict()
def get_GET_arg(self):
return "%s=%s" % (TRANSID, self.transaction_id)
def get_GET_arg(self):
return "%s=%s" % (TRANSID, self.transaction_id)