Merged revisions 86388 via svnmerge from
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
........
diff --git a/Lib/imaplib.py b/Lib/imaplib.py
index c8f32a7..357ba83 100644
--- a/Lib/imaplib.py
+++ b/Lib/imaplib.py
@@ -884,14 +884,17 @@
def _command_complete(self, name, tag):
- self._check_bye()
+ # BYE is expected after LOGOUT
+ if name != 'LOGOUT':
+ self._check_bye()
try:
typ, data = self._get_tagged_response(tag)
except self.abort, val:
raise self.abort('command: %s => %s' % (name, val))
except self.error, val:
raise self.error('command: %s => %s' % (name, val))
- self._check_bye()
+ if name != 'LOGOUT':
+ self._check_bye()
if typ == 'BAD':
raise self.error('%s command error: %s %s' % (name, typ, data))
return typ, data