[Python-checkins] CVS: python/dist/src/Lib smtplib.py,1.44,1.45

Fred L. Drake fdrake@users.sourceforge.net
Sat, 13 Oct 2001 11:35:34 -0700


Update of /cvsroot/python/python/dist/src/Lib
In directory usw-pr-cvs1:/tmp/cvs-serv11942

Modified Files:
	smtplib.py 
Log Message:
SMTPError should be SMTPException; reported by Neal Norwitz.

Index: smtplib.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/smtplib.py,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** smtplib.py	2001/10/07 08:53:32	1.44
--- smtplib.py	2001/10/13 18:35:32	1.45
***************
*** 486,490 ****
           SMTPAuthenticationError  The server didn't accept the username/
                                    password combination.
!          SMTPError                No suitable authentication method was
                                    found.
          """
--- 486,490 ----
           SMTPAuthenticationError  The server didn't accept the username/
                                    password combination.
!          SMTPException            No suitable authentication method was
                                    found.
          """
***************
*** 538,542 ****
                  AUTH_PLAIN + " " + encode_plain(user, password))
          elif authmethod == None:
!             raise SMTPError("No suitable authentication method found.")
          if code not in [235, 503]:
              # 235 == 'Authentication successful'
--- 538,542 ----
                  AUTH_PLAIN + " " + encode_plain(user, password))
          elif authmethod == None:
!             raise SMTPException("No suitable authentication method found.")
          if code not in [235, 503]:
              # 235 == 'Authentication successful'