[AIRFLOW-2696] Setting UTF-8 as default mime_charset mail

update UPDATING.md Closes #3559 from lxneng/feature/utf8_mime_charset
apache · Jul 1, 2018 · 985a433 · 985a433
1 parent 89c1f53
commit 985a433
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/UPDATING.md b/UPDATING.md
@@ -5,6 +5,8 @@ assists users migrating to a new version.
 
 ## Airflow Master
 
+### Setting UTF-8 as default mime_charset in email utils
+
 ### Add a configuration variable(default_dag_run_display_number) to control numbers of dag run for display
 Add a configuration variable(default_dag_run_display_number) under webserver section to control num of dag run to show in UI.
 

diff --git a/airflow/utils/email.py b/airflow/utils/email.py
@@ -41,7 +41,7 @@
 
 def send_email(to, subject, html_content,
                files=None, dryrun=False, cc=None, bcc=None,
-               mime_subtype='mixed', mime_charset='us-ascii', **kwargs):
+               mime_subtype='mixed', mime_charset='utf-8', **kwargs):
     """
     Send email using backend specified in EMAIL_BACKEND.
     """
@@ -55,7 +55,7 @@ def send_email(to, subject, html_content,
 
 def send_email_smtp(to, subject, html_content, files=None,
                     dryrun=False, cc=None, bcc=None,
-                    mime_subtype='mixed', mime_charset='us-ascii',
+                    mime_subtype='mixed', mime_charset='utf-8',
                     **kwargs):
     """
     Send an email with html content

diff --git a/tests/core.py b/tests/core.py
@@ -2429,7 +2429,7 @@ def test_custom_backend(self, mock_send_email):
         utils.email.send_email('to', 'subject', 'content')
         send_email_test.assert_called_with(
             'to', 'subject', 'content', files=None, dryrun=False,
-            cc=None, bcc=None, mime_charset='us-ascii', mime_subtype='mixed')
+            cc=None, bcc=None, mime_charset='utf-8', mime_subtype='mixed')
         self.assertFalse(mock_send_email.called)