[Checkins] SVN: Products.CMFDefault/trunk/Products/CMFDefault/RegistrationTool.py - added socket.error fallback

[Yvo Schubbe]

Log message for revision 130265:
  - added socket.error fallback

Changed:
  U   Products.CMFDefault/trunk/Products/CMFDefault/RegistrationTool.py

-=-
Modified: Products.CMFDefault/trunk/Products/CMFDefault/RegistrationTool.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/RegistrationTool.py	2013-07-06 08:36:32 UTC (rev 130264)
+++ Products.CMFDefault/trunk/Products/CMFDefault/RegistrationTool.py	2013-07-06 08:56:42 UTC (rev 130265)
@@ -13,6 +13,8 @@
 """ CMFDefault portal_registration tool.
 """
 
+import socket
+
 from AccessControl.requestmethod import postonly
 from AccessControl.SecurityInfo import ClassSecurityInfo
 from Acquisition import aq_base
@@ -155,8 +157,9 @@
         host = getUtility(IMailHost)
         try:
             host.send(mail_text, immediate=True)
-        except TypeError:
+        except (TypeError, socket.error):
             # fallback for mail hosts that don't implement the new signature
+            # fallback to queue if immediate fails
             host.send(mail_text)
 
         try:
@@ -204,8 +207,9 @@
         host = getUtility(IMailHost)
         try:
             host.send(mail_text, immediate=True)
-        except TypeError:
+        except (TypeError, socket.error):
             # fallback for mail hosts that don't implement the new signature
+            # fallback to queue if immediate fails
             host.send(mail_text)
 
     security.declareProtected(ManagePortal, 'editMember')