w

tests/chz_gmaillib.py

@@ -24,7 +24,9 @@ def mail2(mailobj):
 
     msg = MIMEMultipart()
     msg['Subject'] = mailobj['title']
-    msg['From'] = 'jared@choozmo.com'
+#    msg['From'] = 'jared@choozmo.com'
+    msg['From'] = gmail_user
+
     msg['To'] = toaddr
     image_paths=['c:/data/mail/mail3/images/image-1.png','c:/data/mail/mail3/images/image-2.png','c:/data/mail/mail3/images/image-3.png','c:/data/mail/mail3/images/image-4.png','c:/data/mail/mail3/images/image-5.png']
     msgAlternative = MIMEMultipart('alternative')
@@ -78,15 +80,16 @@ def mail2(mailobj):
 #'合作洽談 | ChoozMo '
 
 def mail_to_other(mailobj):
-    gmail_user = 'jared@choozmo.com'
-    gmail_password='jgferbhelzrtgsbb'
+    gmail_user = mailobj['gmail_user']
+    gmail_password=mailobj['gmail_password']
+
     sent_from = gmail_user
     toaddr=mailobj['toaddr']
     to = [toaddr]
 
     msg = MIMEMultipart()
     msg['Subject'] = mailobj['title']
-    msg['From'] = 'jared@choozmo.com'
+    msg['From'] = gmail_user
     msg['To'] = toaddr
     image_paths=['c:/tmp/images/image-1.png','c:/tmp/images/image-2.png','c:/tmp/images/image-3.png','c:/tmp/images/image-4.png','c:/tmp/images/image-5.png','c:/tmp/images/image-6.png','c:/tmp/images/image-7.jpeg','c:/tmp/images/image-8.jpeg']
     msgAlternative = MIMEMultipart('alternative')