traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

^D means EOF on Unix but not on Windows. Expand the example's prompt to 

tell Windows Truth too.

Bugfix candidate.
This commit is contained in:
Tim Peters 2003-06-15 23:08:45 +00:00
parent 9e6fedd2ec
commit 9ca3f02dc0
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Doc/lib/libsmtplib.tex
View File

@ -50,7 +50,7 @@ A nice selection of exceptions is defined as well:
\end{excdesc} \end{excdesc}
\begin{excdesc}{SMTPSenderRefused} \begin{excdesc}{SMTPSenderRefused}
Sender address refused. In addition to the attributes set by on all Sender address refused. In addition to the attributes set by on all
\exception{SMTPResponseException} exceptions, this sets `sender' to \exception{SMTPResponseException} exceptions, this sets `sender' to
the string that the SMTP server refused. the string that the SMTP server refused.
\end{excdesc} \end{excdesc}
@ -98,10 +98,10 @@ received from the server.
\end{methoddesc} \end{methoddesc}
\begin{methoddesc}{connect}{\optional{host\optional{, port}}} \begin{methoddesc}{connect}{\optional{host\optional{, port}}}
Connect to a host on a given port. The defaults are to connect to the Connect to a host on a given port. The defaults are to connect to the
local host at the standard SMTP port (25). local host at the standard SMTP port (25).
If the hostname ends with a colon (\character{:}) followed by a If the hostname ends with a colon (\character{:}) followed by a
number, that suffix will be stripped off and the number interpreted as number, that suffix will be stripped off and the number interpreted as
the port number to use. the port number to use.
This method is automatically invoked by the constructor if a This method is automatically invoked by the constructor if a
host is specified during instantiation. host is specified during instantiation.
@ -257,7 +257,7 @@ consult the module code.
This example prompts the user for addresses needed in the message This example prompts the user for addresses needed in the message
envelope (`To' and `From' addresses), and the message to be envelope (`To' and `From' addresses), and the message to be
delivered. Note that the headers to be included with the message must delivered. Note that the headers to be included with the message must
be included in the message as entered; this example doesn't do any be included in the message as entered; this example doesn't do any
processing of the \rfc{822} headers. In particular, the `To' and processing of the \rfc{822} headers. In particular, the `To' and
`From' addresses must be included in the message headers explicitly. `From' addresses must be included in the message headers explicitly.
@ -271,7 +271,7 @@ def prompt(prompt):
fromaddr = prompt("From: ") fromaddr = prompt("From: ")
toaddrs = prompt("To: ").split() toaddrs = prompt("To: ").split()
print "Enter message, end with ^D:" print "Enter message, end with ^D (Unix) or ^Z (Windows):"
# Add the From: and To: headers at the start! # Add the From: and To: headers at the start!
msg = ("From: %s\r\nTo: %s\r\n\r\n" msg = ("From: %s\r\nTo: %s\r\n\r\n"