david/jmc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Message subject added

Browse Source 
- Jabber messages now have a subject
- Some bugs corrected :
	- password storage true by default
	- better exception handling
	- storage.__setitem__ called after account object complete

darcs-hash:20060206133741-86b55-0a51e24fb65b16c1c942b088f7052ab88248b9ac.gz
This commit is contained in:
David Rousselie
2006-02-06 14:37:41 +01:00
parent 8dc5a2aaa5
commit e5e80b2b0a
4 changed files with 71 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
jabber/mailconnection.py
View File

@@ -226,23 +226,26 @@ class MailConnection(object):
def format_message(self, email_msg, include_body = True):
from_decoded = email.Header.decode_header(email_msg["From"])
charset_hint = None
email_from = u""
result = u"From : "
for i in range(len(from_decoded)):
if from_decoded[i][1]:
charset_hint = from_decoded[i][1]
result += unicode(from_decoded[i][0].decode(from_decoded[i][1]))
email_from += unicode(from_decoded[i][0].decode(from_decoded[i][1]))
else:
try:
result += unicode(from_decoded[i][0])
email_from += unicode(from_decoded[i][0])
except Exception,e:
try:
result += unicode(from_decoded[i][0].decode("iso-8859-1"))
email_from += unicode(from_decoded[i][0].decode("iso-8859-1"))
except Exception, e:
try:
result += unicode(from_decoded[i][0].decode(default_encoding))
email_from += unicode(from_decoded[i][0].decode(default_encoding))
except Exception, e:
print e
result += "\n"
type, value, stack = sys.exc_info()
print >>sys.stderr, "".join(traceback.format_exception
(type, value, stack, 5))
result += email_from + u"\n"
subject_decoded = email.Header.decode_header(email_msg["Subject"])
result += u"Subject : "
@@ -279,7 +282,7 @@ class MailConnection(object):
content_type = part.get_content_type()
if action.has_key(content_type):
result += action[content_type](part) + u'\n'
return result
return (result, email_from)
def format_message_summary(self, email_msg):
return self.format_message(email_msg, False)