[Commits] (bkirsch) fixes bug 1795 by checking if the email address is None

commits at osafoundation.org commits at osafoundation.org
Wed Oct 13 13:11:11 PDT 2004


Commit by: bkirsch
Modified files:
chandler/parcels/osaf/mail/message.py 1.26 1.27

Log message:
fixes bug 1795 by checking if the email address is None

ViewCVS links:
http://cvs.osafoundation.org/index.cgi/chandler/parcels/osaf/mail/message.py.diff?r1=text&tr1=1.26&r2=text&tr2=1.27

Index: chandler/parcels/osaf/mail/message.py
diff -u chandler/parcels/osaf/mail/message.py:1.26 chandler/parcels/osaf/mail/message.py:1.27
--- chandler/parcels/osaf/mail/message.py:1.26	Fri Oct  8 12:15:39 2004
+++ chandler/parcels/osaf/mail/message.py	Wed Oct 13 13:11:09 2004
@@ -1,5 +1,5 @@
-__revision__  = "$Revision: 1.26 $"
-__date__      = "$Date: 2004/10/08 19:15:39 $"
+__revision__  = "$Revision: 1.27 $"
+__date__      = "$Date: 2004/10/13 20:11:09 $"
 __copyright__ = "Copyright (c) 2004 Open Source Applications Foundation"
 __license__   = "http://osafoundation.org/Chandler_0.1_license_terms.htm"
 
@@ -443,7 +443,11 @@
             ea = Mail.EmailAddress.getEmailAddress(addr[1],
                                                    **keyArgs)
 
-            setattr(kindVar, attr, ea)
+            if ea is not None:
+                setattr(kindVar, attr, ea)
+
+            elif __debug__:
+                logging.error("in osaf.mail.message.__assignToKind: invalid email address found")
 
     elif type == "EmailAddressList":
         if messageObject[key] is not None:
@@ -454,9 +458,13 @@
 
                 # Use any existing EmailAddress, but don't update them
                 #  because that will cause the item to go stale in the UI thread.
-                ea = Mail.EmailAddress.getEmailAddress(addr[1], 
+                ea = Mail.EmailAddress.getEmailAddress(addr[1],
                                                        **keyArgs)
-                kindVar.append(ea)
+                if ea is not None:
+                    kindVar.append(ea)
+
+                elif __debug__:
+                    logging.error("in osaf.mail.message.__assignToKind: invalid email address found")
     else:
         logging.error("in osaf.mail.message.__assignToKind: HEADER SLIPPED THROUGH")
 



More information about the Commits mailing list