@@ -15,10 +15,10 @@ def _check_valid_string(string):
15
15
return False
16
16
17
17
18
- def set_email_config (email , password ):
18
+ def set_email_config (email , password , sender_name = '' ):
19
19
global mail_cred
20
20
if _check_valid_string (email ) and _check_valid_string (password ):
21
- _set_email_credentials (mail_cred , email , password )
21
+ _set_email_credentials (mail_cred , email , password , sender_name )
22
22
23
23
24
24
@Async
@@ -30,7 +30,7 @@ def send_email(subject, message, to_addr, cc_addr=None, bcc_addr=None):
30
30
31
31
client = smtplib .SMTP_SSL (SMTP_GMAIL_URL )
32
32
client = _login_client (client )
33
- recipients , email_body = _build_email (subject , message , mail_cred . EMAIL_ID , to_addr , cc_addr , bcc_addr )
33
+ recipients , email_body = _build_email (subject , message , to_addr , cc_addr , bcc_addr )
34
34
client .sendmail (mail_cred .EMAIL_ID , recipients , email_body )
35
35
client .quit ()
36
36
@@ -64,8 +64,13 @@ def _check_recipients(to_addr, cc_addr, bcc_addr):
64
64
return to_addr , cc_addr , bcc_addr
65
65
66
66
67
- def _build_email (subject , text , from_email , to_emails , cc_emails , bcc_emails ):
68
- message = "From: %s\r \n " % from_email \
67
+ def _build_email (subject , text , to_emails , cc_emails , bcc_emails ):
68
+ global mail_cred
69
+ if len (mail_cred .EMAIL_USER ) > 0 :
70
+ sender = mail_cred .EMAIL_USER + ' <' + mail_cred .EMAIL_ID + '>'
71
+ else :
72
+ sender = mail_cred .EMAIL_ID
73
+ message = "From: %s\r \n " % (sender ) \
69
74
+ "To: %s\r \n " % "," .join (to_emails ) \
70
75
+ "CC: %s\r \n " % "," .join (cc_emails ) \
71
76
+ "Subject: %s\r \n " % subject \
0 commit comments