Changeset 8382

Timestamp:

7 May 2012, 10:53:25 (13 years ago)

Author:

uli

Message:

Handle unusual SMTP address parts more predictable.

Location:

main/waeup.kofa/trunk/src/waeup/kofa

Files:

• smtp.py (modified) (1 diff)
• tests/test_smtp.py (modified) (1 diff)

main/waeup.kofa/trunk/src/waeup/kofa/smtp.py

@@ -93 +93 @@
 
 def encode_header_item(item):
+    """Turns `item`, a string into an SMTP header part string.
+
+    Encodings are checked carefully (we try to encode as ASCII,
+    Latin-1 and UTF-8 in that order).
+
+    If `item` is not a basestring, `None` is returned.
+    """
+    if not isinstance(item, basestring):
+        return None
     if not isinstance(item, unicode):
-        try:
-            item = unicode(item, 'utf-8')
-        except TypeError:
-            return None
+        item = unicode(item, 'utf-8')
     return str(Header(item, 'iso-8859-1')) # try ascii, then latin1, then utf-8
 

main/waeup.kofa/trunk/src/waeup/kofa/tests/test_smtp.py

@@ -75 +75 @@
         result3 = encode_header_item(u'Plain Name')
         result4 = encode_header_item(u'Name with umläut')
+        result5 = encode_header_item(None)
         self.assertEqual(result1, u'Plain Name')
         self.assertEqual(result2, u'=?iso-8859-1?q?Name_with_uml=E4ut?=')
         self.assertEqual(result3, u'Plain Name')
         self.assertEqual(result4, u'=?iso-8859-1?q?Name_with_uml=E4ut?=')
+        self.assertTrue(result5 is None)
         return