mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-16 23:01:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merged revisions 86388 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r86388 | antoine.pitrou | 2010-11-10 01:18:40 +0100 (mer., 10 nov. 2010) | 3 lines

  Forward port r86386 after it fixed the 3.1 buildbot issues
........
This commit is contained in:
Antoine Pitrou 2010-11-10 00:20:18 +00:00
parent 7eaa448e59
commit 1d519cde65
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Lib/imaplib.py
View file

@ -884,14 +884,17 @@ class IMAP4:
def _command_complete(self, name, tag): def _command_complete(self, name, tag):
self._check_bye() # BYE is expected after LOGOUT
if name != 'LOGOUT':
self._check_bye()
try: try:
typ, data = self._get_tagged_response(tag) typ, data = self._get_tagged_response(tag)
except self.abort, val: except self.abort, val:
raise self.abort('command: %s => %s' % (name, val)) raise self.abort('command: %s => %s' % (name, val))
except self.error, val: except self.error, val:
raise self.error('command: %s => %s' % (name, val)) raise self.error('command: %s => %s' % (name, val))
self._check_bye() if name != 'LOGOUT':
self._check_bye()
if typ == 'BAD': if typ == 'BAD':
raise self.error('%s command error: %s %s' % (name, typ, data)) raise self.error('%s command error: %s %s' % (name, typ, data))
return typ, data return typ, data