[Python-checkins] CVS: python/dist/src/Lib imaplib.py,1.15,1.16

Guido van Rossum guido@cnri.reston.va.us
Wed, 23 Feb 2000 21:24:53 -0500 (EST)


Update of /projects/cvsroot/python/dist/src/Lib
In directory eric:/projects/python/develop/guido/src/Lib

Modified Files:
	imaplib.py 
Log Message:
Piers Lauder:

	A change in my last patch could, under certain circumstances,
	cause a loop if the connection to the server dropped while
	waiting for a command completion. I've changed the code to
	re-raise the error after possible debugging output.


Index: imaplib.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/imaplib.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** imaplib.py	2000/02/17 17:12:39	1.15
--- imaplib.py	2000/02/24 02:24:50	1.16
***************
*** 16,20 ****
  """
  
! __version__ = "2.30"
  
  import binascii, re, socket, string, time, random, sys
--- 16,20 ----
  """
  
! __version__ = "2.32"
  
  import binascii, re, socket, string, time, random, sys
***************
*** 756,762 ****
  
  			# Some have reported "unexpected response" exceptions.
! 			# (Isn't this non-IMAP4-compliant behaviour?
! 			# Please mail me details printed below!)
! 			# Anyway, ignore them here.
  
  			try:
--- 756,762 ----
  
  			# Some have reported "unexpected response" exceptions.
! 			# Note that ignoring them here causes loops.
! 			# Instead, send me details of the unexpected response and
! 			# I'll update the code in `_get_response()'.
  
  			try:
***************
*** 765,770 ****
  				if __debug__:
  					if self.debug >= 1:
- 						_mesg('abort exception ignored: %s' % val)
  						print_log()
  
  
--- 765,770 ----
  				if __debug__:
  					if self.debug >= 1:
  						print_log()
+ 				raise