Rooba
/
cpython
mirror of https://github.com/python/cpython.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Patch by Piers Lauder, who writes: 

This patch is re: Lucas.Dejonge@awtpl.com.au: [Python-bugs-list] imaplib -
not complying with RFC (PR#218)

Lucas de Jonge reported that the code in imaplib that detects a read-write
to read-only change doesn't comply with RFC 2060.
This commit is contained in:
Guido van Rossum 2000-02-28 22:37:30 +00:00
parent c517b9b406
commit 619c33787b
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Lib/imaplib.py
View File

@ -15,7 +15,7 @@
#
# Authentication code contributed by Donn Cave <donn@u.washington.edu> June 1998.
__version__ = "2.32"
__version__ = "2.33"
import binascii, re, socket, string, time, random, sys
@ -128,6 +128,7 @@ def __init__(self, host = '', port = IMAP4_PORT):
self.tagged_commands = {} # Tagged commands awaiting response
self.untagged_responses = {} # {typ: [data, ...], ...}
self.continuation_response = '' # Last continuation response
self.is_readonly = None # READ-ONLY desired state
self.tagnum = 0
# Open socket to server.
@ -470,6 +471,7 @@ def select(self, mailbox='INBOX', readonly=None):
"""
# Mandated responses are ('FLAGS', 'EXISTS', 'RECENT', 'UIDVALIDITY')
self.untagged_responses = {} # Flush old responses.
self.is_readonly = readonly
if readonly:
name = 'EXAMINE'
else:
@ -479,7 +481,7 @@ def select(self, mailbox='INBOX', readonly=None):
self.state = 'AUTH' # Might have been 'SELECTED'
return typ, dat
self.state = 'SELECTED'
if not self.untagged_responses.has_key('READ-WRITE') \
if self.untagged_responses.has_key('READ-ONLY') \
and not readonly:
if __debug__:
if self.debug >= 1:
@ -594,9 +596,8 @@ def _command(self, name, *args):
if self.untagged_responses.has_key(typ):
del self.untagged_responses[typ]
if self.untagged_responses.has_key('READ-WRITE') \
and self.untagged_responses.has_key('READ-ONLY'):
del self.untagged_responses['READ-WRITE']
if self.untagged_responses.has_key('READ-ONLY') \
and not self.is_readonly:
raise self.readonly('mailbox status changed to READ-ONLY')
tag = self._new_tag()