summaryrefslogtreecommitdiff
path: root/django/core
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2013-01-03 20:41:45 +0100
committerClaude Paroz <claude@2xlibre.net>2013-01-03 20:45:57 +0100
commit5b8c0d22cc07ca727c032edf3309fab9cb39f21d (patch)
tree2d7c8c9b44b80aaf536d0a26b25bbb8ca4e85fc1 /django/core
parent4081042ef51c0e679c78f2d0d13514af3434ed13 (diff)
[1.5.x] Fixed #19382 -- Stopped smtp backend raising exception when already closed
Thanks Sebastian Noack for the report and the initial patch. Backport of ffa50ca35 from master.
Diffstat (limited to 'django/core')
-rw-r--r--django/core/mail/backends/smtp.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/django/core/mail/backends/smtp.py b/django/core/mail/backends/smtp.py
index baffa8f2df..3ae08f4340 100644
--- a/django/core/mail/backends/smtp.py
+++ b/django/core/mail/backends/smtp.py
@@ -60,6 +60,8 @@ class EmailBackend(BaseEmailBackend):
def close(self):
"""Closes the connection to the email server."""
+ if self.connection is None:
+ return
try:
try:
self.connection.quit()