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

handle multiple receivers in messages

Browse source
This commit is contained in:
Christophe Benz 2010-11-22 15:06:25 +01:00
commit 18e02f2fea
11 changed files with 46 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

3
weboob/backends/sfr/backend.py
View file

@ -18,8 +18,6 @@
from __future__ import with_statement
import re
from weboob.capabilities.messages import CantSendMessage, ICapMessages, ICapMessagesPost
from weboob.capabilities.account import ICapAccount, StatusField
from weboob.tools.backend import BaseBackend
@ -56,6 +54,5 @@ class SfrBackend(BaseBackend, ICapAccount, ICapMessages, ICapMessagesPost):
def post_message(self, message):
if not message.content.strip():
raise CantSendMessage(u'Message content is empty.')
message.receiver = ','.join(re.sub(' +', '', receiver) for receiver in message.receiver.split(','))
with self.browser:
self.browser.post_message(message)

4
weboob/backends/sfr/pages/compose.py
View file

@ -39,12 +39,12 @@ class ComposePage(BasePage):
return remaining_regex.match(text).groupdict().get('nb')
def post_message(self, message):
receiver_list = [receiver.strip() for receiver in message.receiver.split(',')]
receiver_list = [re.sub(' +', '', receiver) for receiver in message.receivers]
for receiver in receiver_list:
if self.phone_regex.match(receiver) is None:
raise CantSendMessage(u'Invalid receiver: %s' % receiver)
self.browser.select_form(nr=0)
self.browser['msisdns'] = message.receiver
self.browser['msisdns'] = ','.join(receiver_list)
self.browser['textMessage'] = message.content
self.browser.submit()