[Python-checkins] CVS: python/dist/src/Doc/lib libsmtplib.tex,1.16,1.16.6.1

Fred L. Drake fdrake@users.sourceforge.net
Sun, 20 May 2001 06:35:48 -0700


Update of /cvsroot/python/python/dist/src/Doc/lib
In directory usw-pr-cvs1:/tmp/cvs-serv2033/lib

Modified Files:
      Tag: release21-maint
	libsmtplib.tex 
Log Message:

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.


Index: libsmtplib.tex
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/lib/libsmtplib.tex,v
retrieving revision 1.16
retrieving revision 1.16.6.1
diff -C2 -r1.16 -r1.16.6.1
*** libsmtplib.tex	2000/10/03 05:56:55	1.16
--- libsmtplib.tex	2001/05/20 13:35:45	1.16.6.1
***************
*** 242,249 ****
  
  def prompt(prompt):
!     return string.strip(raw_input(prompt))
  
  fromaddr = prompt("From: ")
! toaddrs  = string.split(prompt("To: "))
  print "Enter message, end with ^D:"
  
--- 242,249 ----
  
  def prompt(prompt):
!     return raw_input(prompt).strip()
  
  fromaddr = prompt("From: ")
! toaddrs  = prompt("To: ").split()
  print "Enter message, end with ^D:"
  
***************
*** 252,256 ****
         % (fromaddr, string.join(toaddrs, ", ")))
  while 1:
!     line = raw_input()
      if not line:
          break
--- 252,259 ----
         % (fromaddr, string.join(toaddrs, ", ")))
  while 1:
!     try:
!         line = raw_input()
!     except EOFError:
!         break
      if not line:
          break