diff --git a/modules/aum/contact.py b/modules/aum/contact.py index f6fa4de783b3459552b81782c00fa5a65f4dd794..c62565b8fed510095dc60882909f3eb6f93ed691 100644 --- a/modules/aum/contact.py +++ b/modules/aum/contact.py @@ -18,7 +18,11 @@ # along with this weboob module. If not, see . -from html2text import unescape +try: + from HTMLParser import HTMLParser +except ImportError: + from html.parser import HTMLParser + import socket from datetime import datetime from dateutil.parser import parse as parse_dt @@ -231,9 +235,9 @@ def parse_profile(self, profile, consts): self.status = Contact.STATUS_OFFLINE self.status_msg = u'last connection %s' % profile['last_cnx'] - self.summary = unicode(unescape(profile.get('announce', '').strip())) + self.summary = unicode(HTMLParser().unescape(profile.get('announce', '').strip())) if len(profile.get('shopping_list', '')) > 0: - self.summary += u'\n\nLooking for:\n%s' % unescape(profile['shopping_list'].strip()) + self.summary += u'\n\nLooking for:\n%s' % HTMLParser().unescape(profile['shopping_list'].strip()) for photo in profile['pics']: self.set_photo(photo.split('/')[-1], diff --git a/modules/aum/module.py b/modules/aum/module.py index a8c8a9c35003b361807a6399c78b0120ca2da8d9..c3e15f335c8f57259c20d7f4827232cdb1c4111b 100644 --- a/modules/aum/module.py +++ b/modules/aum/module.py @@ -21,10 +21,14 @@ import time import datetime from base64 import b64decode -from html2text import unescape from dateutil import tz from dateutil.parser import parse as _parse_dt +try: + from HTMLParser import HTMLParser +except ImportError: + from html.parser import HTMLParser + from weboob.capabilities.base import NotLoaded from weboob.capabilities.chat import CapChat from weboob.capabilities.messages import CapMessages, CapMessagesPost, Message, Thread @@ -220,7 +224,7 @@ def get_thread(self, id, contacts=None, get_profiles=False): sender=to_unicode(my_name if int(mail['from']) == self.browser.my_id else mails['who']['pseudo']), receivers=[to_unicode(my_name if int(mail['from']) != self.browser.my_id else mails['who']['pseudo'])], date=parse_dt(mail['date']), - content=to_unicode(unescape(mail['message'] or '').strip()), + content=to_unicode(HTMLParser().unescape(mail['message'] or '').strip()), signature=signature, children=[], flags=flags) diff --git a/modules/okc/module.py b/modules/okc/module.py index 343287a876c1fe6be4ae7f1255244599d0cc234b..3fd1b3c6ab14538f780dc9290d1b2a305175abf8 100644 --- a/modules/okc/module.py +++ b/modules/okc/module.py @@ -19,7 +19,11 @@ from collections import OrderedDict from datetime import datetime -from html2text import unescape + +try: + from HTMLParser import HTMLParser +except ImportError: + from html.parser import HTMLParser from weboob.capabilities.contact import CapContact, ContactPhoto, Contact, ProfileNode from weboob.capabilities.dating import CapDating @@ -183,7 +187,7 @@ def get_thread(self, thread): sender=sender.name, receivers=[receiver.name], date=date, - content=to_unicode(unescape(message['body'])), + content=to_unicode(HTMLParser().unescape(message['body'])), children=[], parent=parent, signature=sender.get_text(),