Changeset 7472 for main

Timestamp:

14 Jan 2012, 19:25:40 (13 years ago)

Author:

uli

Message:

Use iso-8859-1 instead of latin1 as mail part encoding name. Looks like Python 2.7 insists on the former as proper name.

Location:

main/waeup.sirp/trunk/src/waeup/sirp

Files:

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

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

@@ -108 +108 @@
     if not isinstance(item, unicode):
         item = unicode(item, 'utf-8')
-    return str(Header(item, 'latin1')) # try ascii, then latin1, then utf-8
+    return str(Header(item, 'iso-8859-1')) # try ascii, then latin1, then utf-8
 
 def encode_address(addr, name=u''):

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

@@ -79 +79 @@
         result4 = encode_header_item(u'Name with umläut')
         self.assertEqual(result1, u'Plain Name')
-        self.assertEqual(result2, u'=?latin1?q?Name_with_uml=E4ut?=')
+        self.assertEqual(result2, u'=?iso-8859-1?q?Name_with_uml=E4ut?=')
         self.assertEqual(result3, u'Plain Name')
-        self.assertEqual(result4, u'=?latin1?q?Name_with_uml=E4ut?=')
+        self.assertEqual(result4, u'=?iso-8859-1?q?Name_with_uml=E4ut?=')
         return
 
@@ -93 +93 @@
         self.assertEqual(result2, 'The Foo <foo@bar.baz>')
         self.assertEqual(result3, 'The Foo <foo@bar.baz>')
-        self.assertEqual(result4, '=?latin1?q?With_Uml=E4ut?= <foo@bar.baz>')
+        self.assertEqual(result4,
+                         '=?iso-8859-1?q?With_Uml=E4ut?= <foo@bar.baz>')
         return