Fix unicode handling in 'View HTML code as formated text'. Fixes #667

This commit is contained in:
Innocenty Enikeew 2014-06-02 21:05:26 +04:00
parent cc21d629c9
commit c848d55462

View File

@ -2583,16 +2583,18 @@ class MyForm(QtGui.QMainWindow):
'''select message from inbox where msgid=?''', msgid) '''select message from inbox where msgid=?''', msgid)
if queryreturn != []: if queryreturn != []:
for row in queryreturn: for row in queryreturn:
messageAtCurrentInboxRow, = row messageText, = row
lines = messageAtCurrentInboxRow.split('\n') messageText = shared.fixPotentiallyInvalidUTF8Data(messageText)
messageText = unicode(messageText, 'utf-8)')
lines = messageText.split('\n')
for i in xrange(len(lines)): for i in xrange(len(lines)):
if 'Message ostensibly from ' in lines[i]: if 'Message ostensibly from ' in lines[i]:
lines[i] = '<p style="font-size: 12px; color: grey;">%s</span></p>' % ( lines[i] = u'<p style="font-size: 12px; color: grey;">%s</span></p>' % (
lines[i]) lines[i])
elif lines[i] == '------------------------------------------------------': elif lines[i] == '------------------------------------------------------':
lines[i] = '<hr>' lines[i] = '<hr>'
content = '' content = u''
for i in xrange(len(lines)): for i in xrange(len(lines)):
content += lines[i] content += lines[i]
content = content.replace('\n\n', '<br><br>') content = content.replace('\n\n', '<br><br>')