p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed #12147 -- Replaced use of try-except-finally to allow for Python 2.4 support. Thanks to knutin for the report. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@11721 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Russell Keith-Magee 2009-11-04 11:38:06 +00:00
parent dd5d7622a5
commit 90a9f81d37
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
django/core/mail/backends/console.py
View File

@ -18,17 +18,20 @@ class EmailBackend(BaseEmailBackend):
return return
self._lock.acquire() self._lock.acquire()
try: try:
stream_created = self.open() # The try-except is nested to allow for
for message in email_messages: # Python 2.4 support (Refs #12147)
self.stream.write('%s\n' % message.message().as_string()) try:
self.stream.write('-'*79) stream_created = self.open()
self.stream.write('\n') for message in email_messages:
self.stream.flush() # flush after each message self.stream.write('%s\n' % message.message().as_string())
if stream_created: self.stream.write('-'*79)
self.close() self.stream.write('\n')
except: self.stream.flush() # flush after each message
if not self.fail_silently: if stream_created:
raise self.close()
except:
if not self.fail_silently:
raise
finally: finally:
self._lock.release() self._lock.release()
return len(email_messages) return len(email_messages)