Merge: python#19063: the unicode-in-set_payload problem isn't getting fixed in 3.4.

bitdancer · bitdancer · commit feb68522fd6e · 2014-02-07T13:04:18.000-05:00
diff --git a/Lib/email/message.py b/Lib/email/message.py
@@ -303,8 +303,6 @@ def set_payload(self, payload, charset=None):
         """
         if hasattr(payload, 'encode'):
             if charset is None:
-                # We should check for ASCII-only here, but we can't do that
-                # for backward compatibility reasons.  Fixed in 3.4.
                 self._payload = payload
                 return
             if not isinstance(charset, Charset):
@@ -352,8 +350,9 @@ def set_charset(self, charset):
             try:
                 cte(self)
             except TypeError:
-                # This if is for backward compatibility and will be removed
-                # in 3.4 when the ascii check is added to set_payload.
+                # This 'if' is for backward compatibility, it allows unicode
+                # through even though that won't work correctly if the
+                # message is serialized.
                 payload = self._payload
                 if payload:
                     try:
