From: Antoine Pitrou <solipsis@pitrou.net>
Date: Wed, 10 Nov 2010 00:20:18 +0000 (+0000)
Subject: Merged revisions 86388 via svnmerge from
X-Git-Tag: v2.7.1rc1~12
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1d519cde654cf663241a765b9d91e663f8fa1953;p=python

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 c8f32a7b60..357ba83891 100644
--- a/Lib/imaplib.py
+++ b/Lib/imaplib.py
@@ -884,14 +884,17 @@ class IMAP4:
 
 
     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