Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-01 06:01:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Patch #1605192: list allowed states in error messages for imaplib.

Browse source
This commit is contained in:
Georg Brandl 2007-03-13 18:24:40 +00:00
parent 9e6b47002a
commit 6c104f6906
1 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Lib/imaplib.py
View file

@ -746,8 +746,10 @@ def uid(self, command, *args):
if not command in Commands: if not command in Commands:
raise self.error("Unknown IMAP4 UID command: %s" % command) raise self.error("Unknown IMAP4 UID command: %s" % command)
if self.state not in Commands[command]: if self.state not in Commands[command]:
raise self.error('command %s illegal in state %s' raise self.error("command %s illegal in state %s, "
% (command, self.state)) "only allowed in states %s" %
(command, self.state,
', '.join(Commands[command])))
name = 'UID' name = 'UID'
typ, dat = self._simple_command(name, command, *args) typ, dat = self._simple_command(name, command, *args)
if command in ('SEARCH', 'SORT'): if command in ('SEARCH', 'SORT'):
@ -811,8 +813,10 @@ def _command(self, name, *args):
if self.state not in Commands[name]: if self.state not in Commands[name]:
self.literal = None self.literal = None
raise self.error( raise self.error("command %s illegal in state %s, "
'command %s illegal in state %s' % (name, self.state)) "only allowed in states %s" %
(name, self.state,
', '.join(Commands[name])))
for typ in ('OK', 'NO', 'BAD'): for typ in ('OK', 'NO', 'BAD'):
if typ in self.untagged_responses: if typ in self.untagged_responses: