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.

diff --git a/Doc/lib/libsmtplib.tex b/Doc/lib/libsmtplib.tex
index bc69387dd9f69c4c1d869e93ae0940c1f86fc43c..4a7b2dfdc89ef79d708283c2158881715887054f 100644 (file)
--- 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