From e9719fe1a79d1bf0db1729940e84538ea83dff88 Mon Sep 17 00:00:00 2001 From: Fred Drake Date: Sun, 20 May 2001 12:26:04 +0000 Subject: Fix bug in smtplib example: the prompt said to end the message with ^D, but doing so raised EOFError. This makes it work as advertised and converts to string methods where reasonable. This closes SF bug #424776. --- Doc/lib/libsmtplib.tex | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Doc/lib/libsmtplib.tex b/Doc/lib/libsmtplib.tex index bc69387d..4a7b2df 100644 --- a/Doc/lib/libsmtplib.tex +++ b/Doc/lib/libsmtplib.tex @@ -241,17 +241,20 @@ import smtplib import string def prompt(prompt): - return string.strip(raw_input(prompt)) + return raw_input(prompt).strip() fromaddr = prompt("From: ") -toaddrs = string.split(prompt("To: ")) +toaddrs = prompt("To: ").split() print "Enter message, end with ^D:" # Add the From: and To: headers at the start! msg = ("From: %s\r\nTo: %s\r\n\r\n" % (fromaddr, string.join(toaddrs, ", "))) while 1: - line = raw_input() + try: + line = raw_input() + except EOFError: + break if not line: break msg = msg + line -- cgit v0.12