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

[okc] Use unicode type instead of str

Browse source
This commit is contained in:
Roger Philibert 2012-03-29 23:42:50 +02:00 • committed by Laurent Defert
commit f8d7840f1b
2 changed files with 22 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

6
modules/okc/backend.py
View file

@ -97,7 +97,7 @@ class OkCBackend(BaseBackend, ICapMessages, ICapContact, ICapMessagesPost):
# continue # continue
t = Thread(int(thread['id'])) t = Thread(int(thread['id']))
t.flags = Thread.IS_DISCUSSION t.flags = Thread.IS_DISCUSSION
t.title = 'Discussion with %s' % thread['username'] t.title = u'Discussion with %s' % thread['username']
yield t yield t
def get_thread(self, id, contacts=None, get_profiles=False): def get_thread(self, id, contacts=None, get_profiles=False):
@ -281,14 +281,14 @@ class OkCBackend(BaseBackend, ICapMessages, ICapContact, ICapMessagesPost):
contact.profile = profile['data'] contact.profile = profile['data']
contact.summary = profile['summary'] contact.summary = profile['summary']
if contact.profile['details']['last_online'].value == 'Online now!': if contact.profile['details']['last_online'].value == u'Online now!':
contact.status = Contact.STATUS_ONLINE contact.status = Contact.STATUS_ONLINE
else: else:
contact.status = Contact.STATUS_OFFLINE contact.status = Contact.STATUS_OFFLINE
contact.status_msg = contact.profile['details']['last_online'].value contact.status_msg = contact.profile['details']['last_online'].value
for no, photo in enumerate(self.browser.get_photos(_id)): for no, photo in enumerate(self.browser.get_photos(_id)):
contact.set_photo('image_%i' % no, url=photo, thumbnail_url=photo) contact.set_photo(u'image_%i' % no, url=photo, thumbnail_url=photo)
return contact return contact
#def _get_partial_contact(self, contact): #def _get_partial_contact(self, contact):

35
modules/okc/pages.py
View file

@ -39,8 +39,8 @@ class ThreadPage(BasePage):
_class = elem.get('class', '') _class = elem.get('class', '')
if 'clearfix' in _class.split(): if 'clearfix' in _class.split():
threads.append({ threads.append({
u'username' : elem.getchildren()[0].get('href').split('/')[-1], u'username' : unicode(elem.getchildren()[0].get('href').split('/')[-1]),
u'id' : elem.get('id', '').split('_')[1], u'id' : unicode(elem.get('id', '').split('_')[1]),
}) })
return threads return threads
@ -60,10 +60,13 @@ class MessagesPage(BasePage):
date = div.getchildren()[2].text date = div.getchildren()[2].text
id_from = li_msg.getchildren()[0].get('href').split('/')[-1] id_from = li_msg.getchildren()[0].get('href').split('/')[-1]
if date is not None:
date = unicode(date)
mails['messages'].append({ mails['messages'].append({
'date' : date, 'date' : date,
'message' : txt, 'message' : unicode(txt),
'id_from' : id_from, 'id_from' : unicode(id_from),
}) })
return mails return mails
@ -100,18 +103,18 @@ class ProfilePage(BasePage):
return None return None
profile = {} profile = {}
profile['id'] = title.text[len('OkCupid: '):] profile['id'] = unicode(title.text[len('OkCupid: '):])
profile['data'] = OrderedDict() profile['data'] = OrderedDict()
profile_p = self.parser.select(self.document.getroot(), "//div[@id='page_content']//p", method='xpath') profile_p = self.parser.select(self.document.getroot(), "//div[@id='page_content']//p", method='xpath')
profile['data']['infos'] = ProfileNode('infos', 'Informations', OrderedDict(), flags=ProfileNode.SECTION) profile['data']['infos'] = ProfileNode('infos', u'Informations', OrderedDict(), flags=ProfileNode.SECTION)
info = { info = {
'age' : profile_p[1].text.split(' / ')[0], 'age' : unicode(profile_p[1].text.split(' / ')[0]),
'sex' : profile_p[1].text.split(' / ')[1], 'sex' : unicode(profile_p[1].text.split(' / ')[1]),
'orientation' : profile_p[1].text.split(' / ')[2], 'orientation' : unicode(profile_p[1].text.split(' / ')[2]),
'relationship' : profile_p[1].text.split(' / ')[3], 'relationship' : unicode(profile_p[1].text.split(' / ')[3]),
} }
for key, val in info.iteritems(): for key, val in info.iteritems():
@ -121,9 +124,9 @@ class ProfilePage(BasePage):
h3_essays = self.parser.select(self.document.getroot(), "//div[@id='page_content']//h3", method='xpath') h3_essays = self.parser.select(self.document.getroot(), "//div[@id='page_content']//h3", method='xpath')
essays = dict(zip(h3_essays, div_essays)) essays = dict(zip(h3_essays, div_essays))
profile['summary'] = div_essays[0].text.strip() profile['summary'] = unicode(div_essays[0].text.strip())
profile['data']['essays'] = ProfileNode('essays', 'Essays', OrderedDict(), flags=ProfileNode.SECTION) profile['data']['essays'] = ProfileNode('essays', u'Essays', OrderedDict(), flags=ProfileNode.SECTION)
for label, val in essays.iteritems(): for label, val in essays.iteritems():
label = unicode(label.text).strip() label = unicode(label.text).strip()
@ -146,11 +149,11 @@ class ProfilePage(BasePage):
# profile['data']['essays'].value['essay_%i' % i] = ProfileNode('essay_%i' % i, title.text, div_essays[i].text.strip()) # profile['data']['essays'].value['essay_%i' % i] = ProfileNode('essay_%i' % i, title.text, div_essays[i].text.strip())
details_div = self.parser.select(self.document.getroot(), "//div[@id='details']//li", method='xpath') details_div = self.parser.select(self.document.getroot(), "//div[@id='details']//li", method='xpath')
profile['data']['details'] = ProfileNode('details', 'Details', OrderedDict(), flags=ProfileNode.SECTION) profile['data']['details'] = ProfileNode('details', u'Details', OrderedDict(), flags=ProfileNode.SECTION)
for elem in details_div: for elem in details_div:
label = elem.getchildren()[0].text.strip() label = unicode(elem.getchildren()[0].text.strip())
val = unicode(elem.getchildren()[1].text.strip())
key = label.lower().replace(' ', '_') key = label.lower().replace(' ', '_')
val = elem.getchildren()[1].text.strip()
profile['data']['details'].value[key] = ProfileNode(key, label, val) profile['data']['details'].value[key] = ProfileNode(key, label, val)
return profile return profile
@ -158,7 +161,7 @@ class ProfilePage(BasePage):
class PhotosPage(BasePage): class PhotosPage(BasePage):
def get_photos(self): def get_photos(self):
imgs = self.parser.select(self.document.getroot(), "//div[@class='pic clearfix']//img", method='xpath') imgs = self.parser.select(self.document.getroot(), "//div[@class='pic clearfix']//img", method='xpath')
return [img.get('src') for img in imgs] return [unicode(img.get('src')) for img in imgs]
class PostMessagePage(BasePage): class PostMessagePage(BasePage):
def post_mail(self, id, content): def post_mail(self, id, content):