From: R David Murray <rdmurray@bitdance.com>
Date: Fri, 7 Feb 2014 18:47:40 +0000 (-0500)
Subject: #20013: don't raise socket error when selected mailbox deleted.
X-Git-Tag: v3.4.0rc1~50^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bd3a11ba34ff57e1a376d6a6eff2e636bdee2160;p=python

#20013: don't raise socket error when selected mailbox deleted.

I'm checking this in without a test because not much of this code
is tested and I don't have time to work up the necessary extensions
to the existing test framework.

The patch itself was tested by the person who reported the bug.
---

diff --git a/Lib/imaplib.py b/Lib/imaplib.py
index 3f6656a762..ad5f4e9de8 100644
--- a/Lib/imaplib.py
+++ b/Lib/imaplib.py
@@ -1063,6 +1063,11 @@ class IMAP4:
                 del self.tagged_commands[tag]
                 return result
 
+            # If we've seen a BYE at this point, the socket will be
+            # closed, so report the BYE now.
+
+            self._check_bye()
+
             # Some have reported "unexpected response" exceptions.
             # Note that ignoring them here causes loops.
             # Instead, send me details of the unexpected response and
diff --git a/Misc/NEWS b/Misc/NEWS
index fb4a3680dc..bf7781ff39 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -45,6 +45,10 @@ Core and Builtins
 Library
 -------
 
+- Issue #20013: Some imap servers disconnect if the current mailbox is
+  deleted, and imaplib did not handle that case gracefully.  Now it
+  handles the 'bye' correctly.
+
 - Issue #19920: TarFile.list() no longer fails when outputs a listing
   containing non-encodable characters.  Based on patch by Vajrasky Kok.