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

Pep8 cleaning, fix author of test.py

Browse source
This commit is contained in:
Florent 2013-05-14 11:21:13 +02:00
commit bda8df7e9b
5 changed files with 18 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

5
modules/gdfsuez/backend.py
View file

@ -18,13 +18,14 @@
# along with weboob. If not, see <http://www.gnu.org/licenses/>. # along with weboob. If not, see <http://www.gnu.org/licenses/>.
from weboob.capabilities.bill import ICapBill, SubscriptionNotFound,\ from weboob.capabilities.bill import ICapBill, SubscriptionNotFound,\
BillNotFound, Subscription, Bill BillNotFound, Subscription, Bill
from weboob.tools.backend import BaseBackend, BackendConfig from weboob.tools.backend import BaseBackend, BackendConfig
from weboob.tools.value import ValueBackendPassword from weboob.tools.value import ValueBackendPassword
from .browser import GdfSuez from .browser import GdfSuez
__all__ = ['GdfSuezBackend'] __all__ = ['GdfSuezBackend']
class GdfSuezBackend(BaseBackend, ICapBill): class GdfSuezBackend(BaseBackend, ICapBill):
NAME = 'gdfsuez' NAME = 'gdfsuez'
MAINTAINER = u'Mathieu Jourdan' MAINTAINER = u'Mathieu Jourdan'
@ -38,7 +39,7 @@ class GdfSuezBackend(BaseBackend, ICapBill):
ValueBackendPassword('password', ValueBackendPassword('password',
label='Password', label='Password',
masked=True) masked=True)
) )
BROWSER = GdfSuez BROWSER = GdfSuez
def create_default_browser(self): def create_default_browser(self):

4
modules/gdfsuez/browser.py
View file

@ -23,6 +23,7 @@ from .pages import LoginPage, HomePage, AccountPage, TimeoutPage, HistoryPage, P
__all__ = ['GdfSuez'] __all__ = ['GdfSuez']
class GdfSuez(BaseBrowser): class GdfSuez(BaseBrowser):
PROTOCOL = 'https' PROTOCOL = 'https'
DOMAIN = 'www.gdfsuez-dolcevita.fr' DOMAIN = 'www.gdfsuez-dolcevita.fr'
@ -31,7 +32,7 @@ class GdfSuez(BaseBrowser):
'.*p/visualiser_mes_contrats.*?_nfpb=true': AccountPage, '.*p/visualiser_mes_contrats.*?_nfpb=true': AccountPage,
'.*p/page_historique_de_mes_factures': HistoryPage, '.*p/page_historique_de_mes_factures': HistoryPage,
'.*clients.*?_nfpb=true&_nfls=false&_pageLabel=page_erreur_timeout_session': TimeoutPage '.*clients.*?_nfpb=true&_nfls=false&_pageLabel=page_erreur_timeout_session': TimeoutPage
} }
loginp = '/portailClients/appmanager/portail/clients' loginp = '/portailClients/appmanager/portail/clients'
homep = '/portailClients/appmanager/portail/clients?_nfpb=true&_pageLabel=page_accueil_compte_en_ligne' homep = '/portailClients/appmanager/portail/clients?_nfpb=true&_pageLabel=page_accueil_compte_en_ligne'
@ -96,4 +97,3 @@ class GdfSuez(BaseBrowser):
for b in self.iter_bills(): for b in self.iter_bills():
if b.id == id: if b.id == id:
return b return b

15
modules/gdfsuez/pages/history.py
View file

@ -32,6 +32,7 @@ from weboob.capabilities.bill import Detail, Bill
__all__ = ['HistoryPage', 'PdfPage'] __all__ = ['HistoryPage', 'PdfPage']
class HistoryPage(BasePage): class HistoryPage(BasePage):
def on_loaded(self): def on_loaded(self):
@ -74,6 +75,7 @@ class HistoryPage(BasePage):
def get_bills(self): def get_bills(self):
return self.bills return self.bills
class PdfPage(): class PdfPage():
def __init__(self, file): def __init__(self, file):
@ -106,13 +108,13 @@ class PdfPage():
# Parsing # Parsing
details = [] details = []
for title in [ 'Abonnement', for title in ['Abonnement',
'Consommation', 'Consommation',
'Contributions et taxes liées à l\'énergie']: 'Contributions et taxes liées à l\'énergie']:
section = page.split(title,1)[1].split('Total ')[0] section = page.split(title, 1)[1].split('Total ')[0]
# When a line holds '(0)', a newline is missing. # When a line holds '(0)', a newline is missing.
section = re.sub(footnote,'\n', section) section = re.sub(footnote, '\n', section)
lines = section.split('\n') lines = section.split('\n')
lines = [x for x in lines if len(x) > 0] # Remove empty lines lines = [x for x in lines if len(x) > 0] # Remove empty lines
@ -184,7 +186,7 @@ class PdfPage():
vat = line.split()[line.count(' ')-1].replace(',', '.') vat = line.split()[line.count(' ')-1].replace(',', '.')
detail.infos = unicode('TVA: ' + vat) detail.infos = unicode('TVA: ' + vat)
elif ' €' in line: elif ' €' in line:
price = line.replace(',','.') price = line.replace(',', '.')
if isinstance(detail, Detail): if isinstance(detail, Detail):
detail.price = Decimal(price.strip(' €')) detail.price = Decimal(price.strip(' €'))
elif re.match(enddate, line): elif re.match(enddate, line):
@ -208,4 +210,3 @@ class PdfPage():
else: else:
pass pass
return self._parse_page(page) return self._parse_page(page)

4
modules/gdfsuez/pages/homepage.py
View file

@ -24,6 +24,7 @@ from weboob.capabilities.bill import Subscription
__all__ = ['LoginPage', 'HomePage', 'AccountPage', 'TimeoutPage'] __all__ = ['LoginPage', 'HomePage', 'AccountPage', 'TimeoutPage']
class LoginPage(BasePage): class LoginPage(BasePage):
def login(self, login, password): def login(self, login, password):
@ -32,11 +33,13 @@ class LoginPage(BasePage):
self.browser["portlet_login_plein_page_3{pageFlow.mForm.password}"] = str(password) self.browser["portlet_login_plein_page_3{pageFlow.mForm.password}"] = str(password)
self.browser.submit() self.browser.submit()
class HomePage(BasePage): class HomePage(BasePage):
def on_loaded(self): def on_loaded(self):
pass pass
class AccountPage(BasePage): class AccountPage(BasePage):
def get_subscription_list(self): def get_subscription_list(self):
@ -61,6 +64,7 @@ class AccountPage(BasePage):
sub.renewdate = sdate sub.renewdate = sdate
yield sub yield sub
class TimeoutPage(BasePage): class TimeoutPage(BasePage):
def on_loaded(self): def on_loaded(self):

2
modules/gdfsuez/test.py
View file

@ -1,6 +1,6 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# Copyright(C) 2012 Romain Bignon # Copyright(C) 2013 Mathieu Jourdan
# #
# This file is part of weboob. # This file is part of weboob.
# #