Index: Lib/imaplib.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/imaplib.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -c -r1.5 -r1.6
*** imaplib.py	1998/05/05 03:08:46	1.5
--- imaplib.py	1998/05/18 14:39:42	1.6
***************
*** 172,179 ****
  			date_time = Time2Internaldate(date_time)
  		else:
  			date_time = None
! 		tag = self._command(name, mailbox, flags, date_time, message)
! 		return self._command_complete(name, tag)
  
  
  	def authenticate(self, func):
--- 172,178 ----
  			date_time = Time2Internaldate(date_time)
  		else:
  			date_time = None
! 		return self._simple_command(name, mailbox, flags, date_time, message)
  
  
  	def authenticate(self, func):
***************
*** 314,319 ****
--- 313,320 ----
  	def recent(self):
  		"""Prompt server for an update.
  
+ 		Flush all untagged responses.
+ 
  		(typ, [data]) = <instance>.recent()
  
  		'data' is None if no new messages,
***************
*** 323,328 ****
--- 324,330 ----
  		typ, dat = self._untagged_response('OK', name)
  		if dat[-1]:
  			return typ, dat
+ 		self.untagged_responses = {}
  		typ, dat = self._simple_command('NOOP')
  		return self._untagged_response(typ, name)
  
***************
*** 338,346 ****
  	def response(self, code):
  		"""Return data for response 'code' if received, or None.
  
  		(code, [data]) = <instance>.response(code)
  		"""
! 		return code, self.untagged_responses.get(code, [None])
  
  
  	def search(self, charset, criteria):
--- 340,350 ----
  	def response(self, code):
  		"""Return data for response 'code' if received, or None.
  
+ 		Old value for response 'code' is cleared.
+ 
  		(code, [data]) = <instance>.response(code)
  		"""
! 		return self._untagged_response(code, code)
  
  
  	def search(self, charset, criteria):
***************
*** 360,374 ****
  	def select(self, mailbox='INBOX', readonly=None):
  		"""Select a mailbox.
  
  		(typ, [data]) = <instance>.select(mailbox='INBOX', readonly=None)
  
  		'data' is count of messages in mailbox ('EXISTS' response).
  		"""
  		# Mandated responses are ('FLAGS', 'EXISTS', 'RECENT', 'UIDVALIDITY')
! 		# Remove immediately interesting responses
! 		for r in ('EXISTS', 'READ-WRITE'):
! 			if self.untagged_responses.has_key(r):
! 				del self.untagged_responses[r]
  		if readonly:
  			name = 'EXAMINE'
  		else:
--- 364,377 ----
  	def select(self, mailbox='INBOX', readonly=None):
  		"""Select a mailbox.
  
+ 		Flush all untagged responses.
+ 
  		(typ, [data]) = <instance>.select(mailbox='INBOX', readonly=None)
  
  		'data' is count of messages in mailbox ('EXISTS' response).
  		"""
  		# Mandated responses are ('FLAGS', 'EXISTS', 'RECENT', 'UIDVALIDITY')
! 		self.untagged_responses = {}	# Flush old responses.
  		if readonly:
  			name = 'EXAMINE'
  		else:
***************
*** 400,407 ****
  
  		(typ, [data]) = <instance>.store(message_set, command, flag_list)
  		"""
! 		command = '%s %s' % (command, flag_list)
! 		typ, dat = self._simple_command('STORE', message_set, command)
  		return self._untagged_response(typ, 'FETCH')
  
  
--- 403,409 ----
  
  		(typ, [data]) = <instance>.store(message_set, command, flag_list)
  		"""
! 		typ, dat = self._simple_command('STORE', message_set, command, flag_list)
  		return self._untagged_response(typ, 'FETCH')
  
  
***************
*** 413,428 ****
  		return self._simple_command('SUBSCRIBE', mailbox)
  
  
! 	def uid(self, command, args):
! 		"""Execute "command args" with messages identified by UID,
  			rather than message number.
  
! 		(typ, [data]) = <instance>.uid(command, args)
  
  		Returns response appropriate to 'command'.
  		"""
  		name = 'UID'
! 		typ, dat = self._simple_command('UID', command, args)
  		if command == 'SEARCH':
  			name = 'SEARCH'
  		else:
--- 415,430 ----
  		return self._simple_command('SUBSCRIBE', mailbox)
  
  
! 	def uid(self, command, *args):
! 		"""Execute "command arg ..." with messages identified by UID,
  			rather than message number.
  
! 		(typ, [data]) = <instance>.uid(command, arg1, arg2, ...)
  
  		Returns response appropriate to 'command'.
  		"""
  		name = 'UID'
! 		typ, dat = apply(self._simple_command, ('UID', command) + args)
  		if command == 'SEARCH':
  			name = 'SEARCH'
  		else:
***************
*** 440,454 ****
  		return self._simple_command('UNSUBSCRIBE', mailbox)
  
  
! 	def xatom(self, name, arg1=None, arg2=None):
  		"""Allow simple extension commands
  			notified by server in CAPABILITY response.
  
! 		(typ, [data]) = <instance>.xatom(name, arg1=None, arg2=None)
  		"""
  		if name[0] != 'X' or not name in self.capabilities:
  			raise self.error('unknown extension command: %s' % name)
! 		return self._simple_command(name, arg1, arg2)
  
  
  
--- 442,456 ----
  		return self._simple_command('UNSUBSCRIBE', mailbox)
  
  
! 	def xatom(self, name, *args):
  		"""Allow simple extension commands
  			notified by server in CAPABILITY response.
  
! 		(typ, [data]) = <instance>.xatom(name, arg, ...)
  		"""
  		if name[0] != 'X' or not name in self.capabilities:
  			raise self.error('unknown extension command: %s' % name)
! 		return apply(self._simple_command, (name,) + args)
  
  
  
***************
*** 475,481 ****
  		tag = self._new_tag()
  		data = '%s %s' % (tag, name)
  		for d in (dat1, dat2, dat3):
! 			if d is not None: data = '%s %s' % (data, d)
  		if literal is not None:
  			data = '%s {%s}' % (data, len(literal))
  
--- 477,491 ----
  		tag = self._new_tag()
  		data = '%s %s' % (tag, name)
  		for d in (dat1, dat2, dat3):
! 			if d is None: continue
! 			if type(d) is type(''):
! 				l = len(string.split(d))
! 			else:
! 				l = 1
! 			if l == 0 or l > 1 and (d[0],d[-1]) not in (('(',')'),('"','"')):
! 				data = '%s "%s"' % (data, d)
! 			else:
! 				data = '%s %s' % (data, d)
  		if literal is not None:
  			data = '%s {%s}' % (data, len(literal))
  
***************
*** 529,539 ****
  		# Read response and store.
  		#
  		# Returns None for continuation responses,
! 		# otherwise first response line received
  
! 		# Protocol mandates all lines terminated by CRLF.
! 
! 		resp = self._get_line()[:-2]
  
  		# Command completion response?
  
--- 539,547 ----
  		# Read response and store.
  		#
  		# Returns None for continuation responses,
! 		# otherwise first response line received.
  
! 		resp = self._get_line()
  
  		# Command completion response?
  
***************
*** 584,590 ****
  
  				# Read trailer - possibly containing another literal
  
! 				dat = self._get_line()[:-2]
  
  			self._append_untagged(typ, dat)
  
--- 592,598 ----
  
  				# Read trailer - possibly containing another literal
  
! 				dat = self._get_line()
  
  			self._append_untagged(typ, dat)
  
***************
*** 614,621 ****
  
  		# Protocol mandates all lines terminated by CRLF
  
  		if __debug__ and self.debug >= 4:
! 			print '\t< %s' % line[:-2]
  		return line
  
  
--- 622,630 ----
  
  		# Protocol mandates all lines terminated by CRLF
  
+ 		line = line[:-2]
  		if __debug__ and self.debug >= 4:
! 			print '\t< %s' % line
  		return line
  
  
***************
*** 638,646 ****
  		return tag
  
  
! 	def _simple_command(self, name, dat1=None, dat2=None):
  
! 		return self._command_complete(name, self._command(name, dat1, dat2))
  
  
  	def _untagged_response(self, typ, name):
--- 647,655 ----
  		return tag
  
  
! 	def _simple_command(self, name, *args):
  
! 		return self._command_complete(name, apply(self._command, (name,) + args))
  
  
  	def _untagged_response(self, typ, name):
***************
*** 648,653 ****
--- 657,664 ----
  		if not self.untagged_responses.has_key(name):
  			return typ, [None]
  		data = self.untagged_responses[name]
+ 		if __debug__ and self.debug >= 5:
+ 			print '\tuntagged_responses[%s] => %.20s..' % (name, `data`)
  		del self.untagged_responses[name]
  		return typ, data
  
***************
*** 755,770 ****
  
  	test_seq1 = (
  	('login', (USER, PASSWD)),
! 	('create', ('/tmp/xxx',)),
! 	('rename', ('/tmp/xxx', '/tmp/yyy')),
! 	('CREATE', ('/tmp/yyz',)),
! 	('append', ('/tmp/yyz', None, None, 'From: anon@x.y.z\n\ndata...')),
! 	('select', ('/tmp/yyz',)),
! 	('recent', ()),
  	('uid', ('SEARCH', 'ALL')),
  	('fetch', ('1', '(INTERNALDATE RFC822)')),
  	('store', ('1', 'FLAGS', '(\Deleted)')),
  	('expunge', ()),
  	('close', ()),
  	)
  
--- 766,781 ----
  
  	test_seq1 = (
  	('login', (USER, PASSWD)),
! 	('create', ('/tmp/xxx 1',)),
! 	('rename', ('/tmp/xxx 1', '/tmp/yyy')),
! 	('CREATE', ('/tmp/yyz 2',)),
! 	('append', ('/tmp/yyz 2', None, None, 'From: anon@x.y.z\n\ndata...')),
! 	('select', ('/tmp/yyz 2',)),
  	('uid', ('SEARCH', 'ALL')),
  	('fetch', ('1', '(INTERNALDATE RFC822)')),
  	('store', ('1', 'FLAGS', '(\Deleted)')),
  	('expunge', ()),
+ 	('recent', ()),
  	('close', ()),
  	)
  
***************
*** 772,779 ****
  	('select', ()),
  	('response',('UIDVALIDITY',)),
  	('uid', ('SEARCH', 'ALL')),
- 	('recent', ()),
  	('response', ('EXISTS',)),
  	('logout', ()),
  	)
  
--- 783,790 ----
  	('select', ()),
  	('response',('UIDVALIDITY',)),
  	('uid', ('SEARCH', 'ALL')),
  	('response', ('EXISTS',)),
+ 	('recent', ()),
  	('logout', ()),
  	)
  
***************
*** 790,796 ****
  		run(cmd, args)
  
  	for ml in run('list', ('/tmp/', 'yy%')):
! 		path = string.split(ml)[-1]
  		run('delete', (path,))
  
  	for cmd,args in test_seq2:
--- 801,809 ----
  		run(cmd, args)
  
  	for ml in run('list', ('/tmp/', 'yy%')):
! 		mo = re.match(r'.*"([^"]+)"$', ml)
! 		if mo: path = mo.group(1)
! 		else: path = string.split(ml)[-1]
  		run('delete', (path,))
  
  	for cmd,args in test_seq2:
***************
*** 800,804 ****
  			continue
  
  		uid = string.split(dat[0])[-1]
! 		run('uid', ('FETCH',
! 			'%s (FLAGS INTERNALDATE RFC822.SIZE RFC822.HEADER RFC822)' % uid))
--- 813,817 ----
  			continue
  
  		uid = string.split(dat[0])[-1]
! 		run('uid', ('FETCH', '%s' % uid,
! 			'(FLAGS INTERNALDATE RFC822.SIZE RFC822.HEADER RFC822)'))