#19981: merge with 3.3.

This commit is contained in:
Ezio Melotti 2013-12-14 12:43:08 +02:00
commit 66f8518acb
1 changed files with 2 additions and 2 deletions

View File

@ -1550,7 +1550,7 @@ programs, mail loss due to interruption of the program, or premature termination
due to malformed messages in the mailbox:: due to malformed messages in the mailbox::
import mailbox import mailbox
import email.Errors import email.errors
list_names = ('python-list', 'python-dev', 'python-bugs') list_names = ('python-list', 'python-dev', 'python-bugs')
@ -1560,7 +1560,7 @@ due to malformed messages in the mailbox::
for key in inbox.iterkeys(): for key in inbox.iterkeys():
try: try:
message = inbox[key] message = inbox[key]
except email.Errors.MessageParseError: except email.errors.MessageParseError:
continue # The message is malformed. Just leave it. continue # The message is malformed. Just leave it.
for name in list_names: for name in list_names: