Skip to content

Reset IMAP state to AUTH after unselect_folder() (fixes #639) #644

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
apoorvdarshan wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Reset IMAP state to AUTH after unselect_folder() (fixes #639) #644

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion imapclient/imapclient.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -830,7 +830,11 @@ def unselect_folder(self):
"""
logger.debug("< UNSELECT")
# IMAP4 class has no `unselect` method so we can't use `_command_and_check` there
_typ, data = self._imap._simple_command("UNSELECT")
typ, data = self._imap._simple_command("UNSELECT")
# Mirror imaplib.IMAP4.unselect: return the connection to the
# authenticated state so subsequent commands (e.g. ENABLE) are legal.
if typ == "OK":
self._imap.state = "AUTH"
return data[0]

def _process_select_response(self, resp):
Expand Down
12 changes: 12 additions & 0 deletions tests/test_imapclient.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,6 +337,18 @@ def test_unselect(self):
self.assertEqual(result, "Unselect completed.")
self.client._imap._simple_command.assert_called_with("UNSELECT")

def test_unselect_resets_state_to_auth(self):
# A successful UNSELECT should return the connection to the
# authenticated state (mirroring imaplib.IMAP4.unselect) so that
# subsequent commands such as ENABLE are legal again. See #639.
self.client._cached_capabilities = [b"UNSELECT"]
self.client._imap.state = "SELECTED"
self.client._imap._simple_command.return_value = ("OK", ["Unselect completed."])

self.client.unselect_folder()

self.assertEqual(self.client._imap.state, "AUTH")


class TestAppend(IMAPClientTest):
def test_without_msg_time(self):
Expand Down