From 740b5f6940dd3b5627981fb20bdbacb80275fe19 Mon Sep 17 00:00:00 2001 From: tonio Date: Wed, 23 Jun 2010 18:32:02 +0200 Subject: [PATCH] Better handling of bad encoded addresses (f*****g spam!!) --- extensions/webmail/lib.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/extensions/webmail/lib.py b/extensions/webmail/lib.py index d93bd15f4..fadc20ec2 100644 --- a/extensions/webmail/lib.py +++ b/extensions/webmail/lib.py @@ -56,7 +56,10 @@ class EmailAddress(object): if part[1] is None: self.name += part[0] else: - self.name += unicode(part[0], part[1]) + try: + self.name += unicode(part[0], part[1]) + except UnicodeDecodeError: + self.name = "" self.fulladdress = "%s <%s>" % (self.name, self.address) def __str__(self):