From e5743278faffa3b8c883c4142f357c59486b2e15 Mon Sep 17 00:00:00 2001 From: Marius Halden Date: Sun, 12 Apr 2015 16:35:02 +0200 Subject: Missed some exceptions --- push.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'push.py') diff --git a/push.py b/push.py index 9b8d40c..b5af9ee 100755 --- a/push.py +++ b/push.py @@ -78,7 +78,7 @@ mail = parser.parse(sys.stdin) title, encoding = email.header.decode_header(mail.get('subject'))[0] try: title = title.decode(encoding).encode('utf-8') -except NameError, TypeError: +except (NameError, TypeError): pass # Lets at least try to handle mime multipart @@ -97,10 +97,10 @@ else: payload = mail.get_payload(decode=True) # Recode payload to utf-8 if possible -encoding = payload.get_charsets()[0] try: + encoding = payload.get_charsets()[0] payload = payload.decode(encoding).encode('utf-8') -except NameError, TypeError: +except (NameError, TypeError, AttributeError): pass msg = payload.strip() -- cgit v1.2.3