From: R David Murray <rdmurray@bitdance.com>
Date: Fri, 23 Mar 2012 02:40:44 +0000 (-0400)
Subject: #14380: Make actual default match docs, fix __init__ order.
X-Git-Tag: v3.3.0a2~81
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=42243c4dcaee5fe6e680d1ea4b1b615dd0d18b10;p=python

#14380: Make actual default match docs, fix __init__ order.

Éric pointed out that given that the default was documented as None, someone
would reasonably pass that to get the default behavior.  In fixing the code to
use None, I noticed that the change to _charset was being done after it had
already been passed to MIMENonMultipart.  The change to the test verifies that
the order is now correct.
---

diff --git a/Lib/email/mime/text.py b/Lib/email/mime/text.py
index 5a5e39bb38..80ff95010f 100644
--- a/Lib/email/mime/text.py
+++ b/Lib/email/mime/text.py
@@ -14,7 +14,7 @@ from email.mime.nonmultipart import MIMENonMultipart
 class MIMEText(MIMENonMultipart):
     """Class for generating text/* type MIME documents."""
 
-    def __init__(self, _text, _subtype='plain', _charset='us-ascii'):
+    def __init__(self, _text, _subtype='plain', _charset=None):
         """Create a text/* type MIME document.
 
         _text is the string for this message object.
@@ -25,16 +25,18 @@ class MIMEText(MIMENonMultipart):
         header.  This defaults to "us-ascii".  Note that as a side-effect, the
         Content-Transfer-Encoding header will also be set.
         """
-        MIMENonMultipart.__init__(self, 'text', _subtype,
-                                  **{'charset': _charset})
 
-        # If _charset was defualted, check to see see if there are non-ascii
-        # characters present. Default to utf-8 if there are.
+        # If no _charset was specified, check to see see if there are non-ascii
+        # characters present. If not, use 'us-ascii', otherwise use utf-8.
         # XXX: This can be removed once #7304 is fixed.
-        if _charset =='us-ascii':
+        if _charset is None:
             try:
-                _text.encode(_charset)
+                _text.encode('us-ascii')
+                _charset = 'us-ascii'
             except UnicodeEncodeError:
                 _charset = 'utf-8'
 
+        MIMENonMultipart.__init__(self, 'text', _subtype,
+                                  **{'charset': _charset})
+
         self.set_payload(_text, _charset)
diff --git a/Lib/test/test_email/test_email.py b/Lib/test/test_email/test_email.py
index 86aa60c134..b07f67593c 100644
--- a/Lib/test/test_email/test_email.py
+++ b/Lib/test/test_email/test_email.py
@@ -621,15 +621,14 @@ class TestMessageAPI(TestEmailBase):
         # Issue 14291
         m = MIMEText('É testabc\n')
         self.assertEqual(str(m),textwrap.dedent("""\
-            MIME-Version: 1.0
             Content-Type: text/plain; charset="utf-8"
+            MIME-Version: 1.0
             Content-Transfer-Encoding: base64
 
             w4kgdGVzdGFiYwo=
             """))
 
 
-
 # Test the email.encoders module
 class TestEncoders(unittest.TestCase):