Mercurial Repositories > eric / file diff

--- a/eric6/UI/EmailDialog.py	Sat Nov 21 19:31:16 2020 +0100
+++ b/eric6/UI/EmailDialog.py	Sun Nov 22 16:04:59 2020 +0100
@@ -330,12 +330,12 @@
                 try:
                     server.login(Preferences.getUser("MailServerUser"),
                                  password)
-                except (smtplib.SMTPException, socket.error) as e:
+                except (smtplib.SMTPException, OSError) as e:
                     if isinstance(e, smtplib.SMTPResponseException):
                         errorStr = e.smtp_error.decode()
                     elif isinstance(e, OSError):
                         errorStr = e.strerror
-                    elif isinstance(e, socket.error):
+                    elif isinstance(e, OSError):
                         errorStr = e[1]
                     else:
                         errorStr = str(e)
@@ -355,12 +355,12 @@
                 server.sendmail(Preferences.getUser("Email"), self.__toAddress,
                                 msg)
                 server.quit()
-        except (smtplib.SMTPException, socket.error) as e:
+        except (smtplib.SMTPException, OSError) as e:
             if isinstance(e, smtplib.SMTPResponseException):
                 errorStr = e.smtp_error.decode()
             elif isinstance(e, smtplib.SMTPException):
                 errorStr = str(e)
-            elif isinstance(e, socket.error):
+            elif isinstance(e, OSError):
                 errorStr = e.strerror
             else:
                 errorStr = str(e)