From 46147cba5ecf13d921cdac50dee268ad39cf93a4 Mon Sep 17 00:00:00 2001 From: Laurent Bachelier Date: Mon, 22 Jul 2013 12:49:00 +0200 Subject: [PATCH] sgpe: Fix logout detection, simpler code The second error was never caught. --- modules/societegenerale/sgpe/pages.py | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/modules/societegenerale/sgpe/pages.py b/modules/societegenerale/sgpe/pages.py index bb577efb..004b7d11 100644 --- a/modules/societegenerale/sgpe/pages.py +++ b/modules/societegenerale/sgpe/pages.py @@ -33,13 +33,10 @@ __all__ = ['LoginPage', 'AccountsPage'] class SGPEPage(BasePage): def get_error(self): - try: - return self.document.xpath('//div[@class="ngo_mire_reco_message"]')[0] \ - .text.strip() - return self.document.xpath('//*[@id="nge_zone_centre"]//[@class="nge_cadre_message_utilisateur"')[0] \ - .text_content.strip() - except IndexError: - return None + err = self.document.getroot().cssselect('div.ngo_mire_reco_message') \ + or self.document.getroot().cssselect('#nge_zone_centre .nge_cadre_message_utilisateur') + if err: + return err[0].text.strip() class LoginPage(SGPEPage):