From: Jeroen Ruigrok van der Werven <asmodai@in-nomine.org>
Date: Sat, 25 Apr 2009 12:49:10 +0000 (+0000)
Subject: Issue #4239: adjust email examples not to use connect() and terminate with
X-Git-Tag: v2.7a1~1413
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a2dce5a9eec9fca19a374bd4713cb0bc8e796e2e;p=python

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

diff --git a/Doc/includes/email-alternative.py b/Doc/includes/email-alternative.py
index d941323937..82e3ffa3b3 100644
--- a/Doc/includes/email-alternative.py
+++ b/Doc/includes/email-alternative.py
@@ -45,4 +45,4 @@ s = smtplib.SMTP('localhost')
 # 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()
diff --git a/Doc/includes/email-dir.py b/Doc/includes/email-dir.py
index c04f57d641..e67de61dcf 100644
--- a/Doc/includes/email-dir.py
+++ b/Doc/includes/email-dir.py
@@ -106,9 +106,8 @@ must be running an SMTP server.
         fp.close()
     else:
         s = smtplib.SMTP()
-        s.connect()
         s.sendmail(opts.sender, opts.recipients, composed)
-        s.close()
+        s.quit()
 
 
 if __name__ == '__main__':
diff --git a/Doc/includes/email-mime.py b/Doc/includes/email-mime.py
index 5097253749..f64df83b4d 100644
--- a/Doc/includes/email-mime.py
+++ b/Doc/includes/email-mime.py
@@ -27,6 +27,5 @@ for file in pngfiles:
 
 # Send the email via our own SMTP server.
 s = smtplib.SMTP()
-s.connect()
 s.sendmail(me, family, msg.as_string())
-s.close()
+s.quit()
diff --git a/Doc/includes/email-simple.py b/Doc/includes/email-simple.py
index 44152a4839..689511e4bb 100644
--- a/Doc/includes/email-simple.py
+++ b/Doc/includes/email-simple.py
@@ -20,6 +20,5 @@ msg['To'] = you
 # 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()