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

fix unicode and exceptions

Browse source
This commit is contained in:
Christophe Benz 2010-12-01 15:37:59 +01:00
commit b042b4b7f6
2 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
weboob/backends/aum/pages/contact_thread.py
View file

@ -257,14 +257,14 @@ class ContactThreadPage(PageBase):
self.browser.submit() # submit current form self.browser.submit() # submit current form
except FormNotFoundError, e: except FormNotFoundError, e:
error = 'Unknown error (%s)' % e error = u'Unknown error (%s)' % e
p_list = self.document.getElementsByTagName('p') p_list = self.document.getElementsByTagName('p')
for p in p_list: for p in p_list:
if p.hasAttribute('align') and p.getAttribute('align') == 'center': if p.hasAttribute('align') and p.getAttribute('align') == 'center':
error = p.firstChild.data error = p.firstChild.data
break break
raise AdopteCantPostMail(error) raise AdopteCantPostMail(error.encode('utf-8'))
""" """

5
weboob/tools/misc.py
View file

@ -38,10 +38,7 @@ def to_unicode(text):
if isinstance(text, unicode): if isinstance(text, unicode):
return text return text
if not isinstance(text, str): if not isinstance(text, str):
try: text = str(text)
text = str(text)
except UnicodeError:
pass
try: try:
return unicode(text, 'utf-8') return unicode(text, 'utf-8')
except UnicodeError: except UnicodeError: