[Python-checkins] r71882 - in python/trunk/Doc/includes: email-alternative.py email-dir.py email-mime.py email-simple.py

[jeroen.ruigrok]

Author: jeroen.ruigrok
Date: Sat Apr 25 14:49:10 2009
New Revision: 71882

Log:
Issue #4239: adjust email examples not to use connect() and terminate with
quit() and not close().


Modified:
   python/trunk/Doc/includes/email-alternative.py
   python/trunk/Doc/includes/email-dir.py
   python/trunk/Doc/includes/email-mime.py
   python/trunk/Doc/includes/email-simple.py

Modified: python/trunk/Doc/includes/email-alternative.py
==============================================================================
--- python/trunk/Doc/includes/email-alternative.py	(original)
+++ python/trunk/Doc/includes/email-alternative.py	Sat Apr 25 14:49:10 2009
@@ -45,4 +45,4 @@
 # sendmail function takes 3 arguments: sender's address, recipient's address
 # and message to send - here it is sent as one string.
 s.sendmail(me, you, msg.as_string())
-s.close()
+s.quit()

Modified: python/trunk/Doc/includes/email-dir.py
==============================================================================
--- python/trunk/Doc/includes/email-dir.py	(original)
+++ python/trunk/Doc/includes/email-dir.py	Sat Apr 25 14:49:10 2009
@@ -106,9 +106,8 @@
         fp.close()
     else:
         s = smtplib.SMTP()
-        s.connect()
         s.sendmail(opts.sender, opts.recipients, composed)
-        s.close()
+        s.quit()
 
 
 if __name__ == '__main__':

Modified: python/trunk/Doc/includes/email-mime.py
==============================================================================
--- python/trunk/Doc/includes/email-mime.py	(original)
+++ python/trunk/Doc/includes/email-mime.py	Sat Apr 25 14:49:10 2009
@@ -27,6 +27,5 @@
 
 # Send the email via our own SMTP server.
 s = smtplib.SMTP()
-s.connect()
 s.sendmail(me, family, msg.as_string())
-s.close()
+s.quit()

Modified: python/trunk/Doc/includes/email-simple.py
==============================================================================
--- python/trunk/Doc/includes/email-simple.py	(original)
+++ python/trunk/Doc/includes/email-simple.py	Sat Apr 25 14:49:10 2009
@@ -20,6 +20,5 @@
 # Send the message via our own SMTP server, but don't include the
 # envelope header.
 s = smtplib.SMTP()
-s.connect()
 s.sendmail(me, [you], msg.as_string())
-s.close()
+s.quit()