From 850630b4b7e79b76ad9732db1be6a2aa4257893f Mon Sep 17 00:00:00 2001 From: Claude Paroz Date: Thu, 3 Jan 2013 22:12:11 +0100 Subject: [PATCH] Replaced deprecated sslerror by ssl.SSLError The exact conditions on which this exception is raised are not known, but this replacement is the best guess we can do at this point. --- django/core/mail/backends/smtp.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/django/core/mail/backends/smtp.py b/django/core/mail/backends/smtp.py index 3ae08f4340..e456b7864e 100644 --- a/django/core/mail/backends/smtp.py +++ b/django/core/mail/backends/smtp.py @@ -1,6 +1,6 @@ """SMTP email backend class.""" import smtplib -import socket +import ssl import threading from django.conf import settings @@ -65,7 +65,7 @@ class EmailBackend(BaseEmailBackend): try: try: self.connection.quit() - except (socket.sslerror, smtplib.SMTPServerDisconnected): + except (ssl.SSLError, smtplib.SMTPServerDisconnected): # This happens when calling quit() on a TLS connection # sometimes, or when the connection was already disconnected # by the server.