diff options
| author | Jeroen Ruigrok van der Werven <asmodai@in-nomine.org> | 2009-04-26 20:25:45 +0000 |
|---|---|---|
| committer | Jeroen Ruigrok van der Werven <asmodai@in-nomine.org> | 2009-04-26 20:25:45 +0000 |
| commit | 889e1d31e0804944da1e1eabd4b59cfa4c19221c (patch) | |
| tree | 1bba75b98de323b9f6fb64da7d74334d66c9969e /Doc/includes | |
| parent | 7c17d9be39c395fddf4287b9cb8b14c746a071bb (diff) | |
| download | cpython-889e1d31e0804944da1e1eabd4b59cfa4c19221c.tar.gz | |
Merged revisions 71874,71882,71890 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r71874 | jeroen.ruigrok | 2009-04-25 13:59:09 +0200 (za, 25 apr 2009) | 2 lines
First attempt to document PyObject_HEAD_INIT and PyVarObject_HEAD_INIT.
........
r71882 | jeroen.ruigrok | 2009-04-25 14:49:10 +0200 (za, 25 apr 2009) | 3 lines
Issue #4239: adjust email examples not to use connect() and terminate with
quit() and not close().
........
r71890 | jeroen.ruigrok | 2009-04-25 15:07:40 +0200 (za, 25 apr 2009) | 3 lines
Rewrite a sentence to be more in line with the rest of the documentation with
regard to person and audience.
........
Diffstat (limited to 'Doc/includes')
| -rw-r--r-- | Doc/includes/email-alternative.py | 2 | ||||
| -rw-r--r-- | Doc/includes/email-dir.py | 3 | ||||
| -rw-r--r-- | Doc/includes/email-mime.py | 3 | ||||
| -rw-r--r-- | Doc/includes/email-simple.py | 3 |
4 files changed, 4 insertions, 7 deletions
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() |