Fixed an issue in the Email config page testing the settings. 5_2_x

Fri, 28 Sep 2012 18:19:01 +0200

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Fri, 28 Sep 2012 18:19:01 +0200
branch
5_2_x
changeset 2066
5c8c46109e0e
parent 2057
547bda693655
child 2068
81f7aecc6599

Fixed an issue in the Email config page testing the settings.
(grafted from aea3ddf97acae1bba665fe77ba9f91bee6e041e0)

Preferences/ConfigurationPages/EmailPage.py file | annotate | diff | comparison | revisions
--- a/Preferences/ConfigurationPages/EmailPage.py	Sat Sep 22 19:07:45 2012 +0200
+++ b/Preferences/ConfigurationPages/EmailPage.py	Fri Sep 28 18:19:01 2012 +0200
@@ -134,7 +134,10 @@
                 elif isinstance(e, socket.timeout):
                     errorStr = str(e)
                 elif isinstance(e, socket.error):
-                    errorStr = e[1]
+                    try:
+                        errorStr = e[1]
+                    except TypeError:
+                        errorStr = str(e)
                 else:
                     errorStr = str(e)
                 E5MessageBox.critical(self,
@@ -149,7 +152,10 @@
             elif isinstance(e, socket.timeout):
                 errorStr = str(e)
             elif isinstance(e, socket.error):
-                errorStr = e[1]
+                try:
+                    errorStr = e[1]
+                except TypeError:
+                    errorStr = str(e)
             else:
                 errorStr = str(e)
             E5MessageBox.critical(self,

eric ide

mercurial