From: R David Murray <rdmurray@bitdance.com>
Date: Sat, 30 Apr 2011 21:29:08 +0000 (-0400)
Subject: Merge #11883: fix email examples by adding 'localhost' to SMTP constructor calls
X-Git-Tag: v3.2.1b1~42
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=361a7df323d759a45062f3299984f4848535bae4;p=python

Merge #11883: fix email examples by adding 'localhost' to SMTP constructor calls
---

361a7df323d759a45062f3299984f4848535bae4
diff --cc Doc/includes/email-mime.py
index ec7e371d00,7b1c028fad..a90edc1373
--- a/Doc/includes/email-mime.py
+++ b/Doc/includes/email-mime.py
@@@ -26,6 -26,6 +26,6 @@@ for file in pngfiles
      msg.attach(img)
  
  # Send the email via our own SMTP server.
- s = smtplib.SMTP()
+ s = smtplib.SMTP('localhost')
 -s.sendmail(me, family, msg.as_string())
 +s.send_message(msg)
  s.quit()
diff --cc Doc/includes/email-simple.py
index fdf6f82924,29bd0782d6..077568d563
--- a/Doc/includes/email-simple.py
+++ b/Doc/includes/email-simple.py
@@@ -17,7 -17,8 +17,7 @@@ msg['Subject'] = 'The contents of %s' 
  msg['From'] = me
  msg['To'] = you
  
 -# Send the message via our own SMTP server, but don't include the
 -# envelope header.
 +# Send the message via our own SMTP server.
- s = smtplib.SMTP()
+ s = smtplib.SMTP('localhost')
 -s.sendmail(me, [you], msg.as_string())
 +s.send_message(msg)
  s.quit()