diff --git a/modules/bouygues/browser.py b/modules/bouygues/browser.py index 8f76af6ccc73d12b6d5bbb3ff16eaa8b20965d47..3214cd299aebbd3365f44bfe7178472d0e071cd7 100644 --- a/modules/bouygues/browser.py +++ b/modules/bouygues/browser.py @@ -37,21 +37,21 @@ class BouyguesBrowser(LoginBrowser): BASEURL = 'https://api.bouyguestelecom.fr' TIMEOUT = 20 - login = URL('https://www.mon-compte.bouyguestelecom.fr/cas/login', LoginPage) - home = URL('https://www.bouyguestelecom.fr/mon-compte', HomePage) - subscriber = URL('/personnes/(?P\d+)$', SubscriberPage) - subscriptions = URL('/personnes/(?P\d+)/comptes-facturation', SubscriptionPage) - subscriptions_details = URL('/comptes-facturation/(?P\d+)/contrats-payes', SubscriptionDetailPage) - document_file = URL('/comptes-facturation/(?P\d+)/factures/\d+/documents', DocumentFilePage) - documents = URL('/comptes-facturation/(?P\d+)/factures', DocumentsPage) - - sms_page = URL('http://www.mobile.service.bbox.bouyguestelecom.fr/services/SMSIHD/sendSMS.phtml', - 'http://www.mobile.service.bbox.bouyguestelecom.fr/services/SMSIHD/confirmSendSMS.phtml', + login = URL(r'https://www.mon-compte.bouyguestelecom.fr/cas/login', LoginPage) + home = URL(r'https://www.bouyguestelecom.fr/mon-compte', HomePage) + subscriber = URL(r'/personnes/(?P\d+)$', SubscriberPage) + subscriptions = URL(r'/personnes/(?P\d+)/comptes-facturation', SubscriptionPage) + subscriptions_details = URL(r'/comptes-facturation/(?P\d+)/contrats-payes', SubscriptionDetailPage) + document_file = URL(r'/comptes-facturation/(?P\d+)/factures/\d+/documents', DocumentFilePage) + documents = URL(r'/comptes-facturation/(?P\d+)/factures', DocumentsPage) + + sms_page = URL(r'http://www.mobile.service.bbox.bouyguestelecom.fr/services/SMSIHD/sendSMS.phtml', + r'http://www.mobile.service.bbox.bouyguestelecom.fr/services/SMSIHD/confirmSendSMS.phtml', SendSMSPage) - confirm = URL('http://www.mobile.service.bbox.bouyguestelecom.fr/services/SMSIHD/resultSendSMS.phtml', UselessPage) - sms_error_page = URL('http://www.mobile.service.bbox.bouyguestelecom.fr/services/SMSIHD/SMS_erreur.phtml', + confirm = URL(r'http://www.mobile.service.bbox.bouyguestelecom.fr/services/SMSIHD/resultSendSMS.phtml', UselessPage) + sms_error_page = URL(r'http://www.mobile.service.bbox.bouyguestelecom.fr/services/SMSIHD/SMS_erreur.phtml', SendSMSErrorPage) - profile = URL('/personnes/(?P\d+)/coordonnees', ProfilePage) + profile = URL(r'/personnes/(?P\d+)/coordonnees', ProfilePage) def __init__(self, username, password, lastname, *args, **kwargs): super(BouyguesBrowser, self).__init__(username, password, *args, **kwargs) diff --git a/modules/bouygues/module.py b/modules/bouygues/module.py index 77ae0c8b711b449935334017b07d5a38d41da73c..b78364e6d892802fbe9837bd16fbb4245dcf9e3e 100644 --- a/modules/bouygues/module.py +++ b/modules/bouygues/module.py @@ -34,7 +34,7 @@ class BouyguesModule(Module, CapMessages, CapMessagesPost, CapDocument, CapProfile): NAME = 'bouygues' - MAINTAINER = u'Bezleputh' + MAINTAINER = 'Bezleputh' EMAIL = 'carton_ben@yahoo.fr' VERSION = '1.4' DESCRIPTION = u'Bouygues Télécom French mobile phone provider' @@ -49,7 +49,7 @@ def create_default_browser(self): def post_message(self, message): if not message.content.strip(): - raise CantSendMessage(u'Message content is empty.') + raise CantSendMessage('Message content is empty.') self.browser.post_message(message) def iter_subscription(self): diff --git a/modules/bouygues/pages.py b/modules/bouygues/pages.py index 02cc1be5396d1c215f154f49c69d6ba0cfb26ae1..79e3eb57633e0a584411047bb6adbeb660118e45 100644 --- a/modules/bouygues/pages.py +++ b/modules/bouygues/pages.py @@ -16,6 +16,8 @@ # You should have received a copy of the GNU Affero General Public License # along with weboob. If not, see . +from __future__ import unicode_literals + import re from datetime import datetime, timedelta @@ -88,7 +90,7 @@ def get_label(self): class SendSMSPage(HTMLPage): def send_sms(self, message, receivers): - sms_number = CleanDecimal(Regexp(CleanText('//span[@class="txt12-o"][1]/strong'), '(\d*) SMS.*'))(self.doc) + sms_number = CleanDecimal(Regexp(CleanText('//span[@class="txt12-o"][1]/strong'), r'(\d*) SMS.*'))(self.doc) if sms_number == 0: msg = CleanText('//span[@class="txt12-o"][1]')(self.doc) @@ -133,11 +135,11 @@ class item(ItemElement): obj_url = Format('https://api.bouyguestelecom.fr%s', Dict('_links/facturePDF/href')) obj_date = Env('date') obj_duedate = Env('duedate') - obj_format = u"pdf" + obj_format = "pdf" obj_label = Env('label') - obj_type = u"bill" + obj_type = "bill" obj_price = CleanDecimal(Dict('mntTotFacture')) - obj_currency = u'EUR' + obj_currency = 'EUR' def parse(self, el): bill_date = datetime.strptime(Dict('dateFacturation')(self), "%Y-%m-%dT%H:%M:%SZ").date() diff --git a/tools/py3-compatible.modules b/tools/py3-compatible.modules index bc8eee35bd0d28e95451b244395da4ea4ee6d870..e606a8fb60c1f249948c84764b412be7ad277fd9 100644 --- a/tools/py3-compatible.modules +++ b/tools/py3-compatible.modules @@ -30,6 +30,7 @@ bnporc bnppere bolden boursorama +bouygues bp bred btmon