Nemcio/mailnag
1
0
Fork 0
mirror of https://github.com/pulb/mailnag.git synced 2026-05-06 07:56:58 +02:00
Code Issues Packages Projects Releases Activity

imap msg dict doesn't seem to throw a keyerror, so throw it explicitely

Browse Source
This commit is contained in:
Patrick Ulbrich
2013-12-17 17:59:17 +01:00
parent 524e6d5654
commit 3d52b106cf
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Mailnag/daemon/mails.py
View File

@@ -154,7 +154,7 @@ class MailCollector:
return mail_list
def _get_header(self, msg_dict):
def _get_header(self, msg_dict):
try:
content = self._get_header_field(msg_dict, 'From')
sender = self._format_header_field('sender', content)
@@ -184,14 +184,13 @@ class MailCollector:
def _get_header_field(self, msg_dict, key):
try:
if msg_dict.has_key(key):
value = msg_dict[key]
except KeyError:
try:
value = msg_dict[key.lower()]
except KeyError, err:
logging.debug("Couldn't get %s from message." % key)
raise err
elif msg_dict.has_key(key.lower()):
value = msg_dict[key.lower()]
else:
logging.debug("Couldn't get %s from message." % key)
raise KeyError
return value