From a724a456a734ed21b522ad442756b0fe45dbe4df Mon Sep 17 00:00:00 2001 From: Sylvie Ye Date: Thu, 31 Jan 2019 11:48:34 +0100 Subject: [PATCH] [societegenerale] email is now on HTMLProfilePage scrap email on this page --- modules/societegenerale/browser.py | 9 +++------ modules/societegenerale/pages/accounts_list.py | 6 +----- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/modules/societegenerale/browser.py b/modules/societegenerale/browser.py index 51ca1535aa..fa0b906dce 100644 --- a/modules/societegenerale/browser.py +++ b/modules/societegenerale/browser.py @@ -34,7 +34,7 @@ from .pages.accounts_list import ( AccountsMainPage, AccountDetailsPage, AccountsPage, LoansPage, HistoryPage, CardHistoryPage, PeaLiquidityPage, AccountsSynthesesPage, - AdvisorPage, HTMLProfilePage, XMLProfilePage, CreditPage, CreditHistoryPage, + AdvisorPage, HTMLProfilePage, CreditPage, CreditHistoryPage, MarketPage, LifeInsurance, LifeInsuranceHistory, LifeInsuranceInvest, LifeInsuranceInvest2, UnavailableServicePage, ) @@ -89,7 +89,6 @@ class SocieteGenerale(LoginBrowser, StatesMixin): # Profile advisor = URL(r'/icd/pon/data/get-contacts.xml', AdvisorPage) html_profile_page = URL(r'/com/dcr-web/dcr/dcr-coordonnees.html', HTMLProfilePage) - xml_profile_page = URL(r'/gms/gmsRestituerAdresseNotificationServlet.xml', XMLProfilePage) # Document bank_statement = URL(r'/restitution/rce_derniers_releves.html', BankStatementPage) @@ -414,13 +413,11 @@ def get_advisor(self): @need_login def get_profile(self): self.html_profile_page.go() - profile = self.page.get_profile() - self.xml_profile_page.go() - profile.email = self.page.get_email() - return profile + return self.page.get_profile() @need_login def iter_subscription(self): + self.accounts_main_page.go() try: profile = self.get_profile() subscriber = profile.name diff --git a/modules/societegenerale/pages/accounts_list.py b/modules/societegenerale/pages/accounts_list.py index e8911f1da8..b50bb766f0 100644 --- a/modules/societegenerale/pages/accounts_list.py +++ b/modules/societegenerale/pages/accounts_list.py @@ -679,15 +679,11 @@ def get_profile(self): profile.address += ' ' + CleanText('//div[@id="dcr-conteneur"]//div[contains(text(), "ADRESSE")]/following::table//tr[5]/td[2]')(self.doc) profile.address += ' ' + CleanText('//div[@id="dcr-conteneur"]//div[contains(text(), "ADRESSE")]/following::table//tr[6]/td[2]')(self.doc) profile.country = CleanText('//div[@id="dcr-conteneur"]//div[contains(text(), "ADRESSE")]/following::table//tr[7]/td[2]')(self.doc) + profile.email = CleanText('//span[@id="currentEmail"]')(self.doc) return profile -class XMLProfilePage(LoggedPage, XMLPage): - def get_email(self): - return CleanText('//AdresseEmailExterne')(self.doc) - - class UnavailableServicePage(LoggedPage, HTMLPage): def on_load(self): if self.doc.xpath('//div[contains(@class, "erreur_404_content")]'): -- GitLab