[Erp5-report] r45325 jm - in /erp5/trunk/products/ERP5Type: ZopePatch.py patches/MailHost.py

[nobody at svn.erp5.org]

Author: jm
Date: Tue Apr 12 11:50:22 2011
New Revision: 45325

URL: http://svn.erp5.org?rev=45325&view=rev
Log:
Patch MailHost to not send emails in tpc_finish on recent Zope

Added:
    erp5/trunk/products/ERP5Type/patches/MailHost.py
Modified:
    erp5/trunk/products/ERP5Type/ZopePatch.py

Modified: erp5/trunk/products/ERP5Type/ZopePatch.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/ZopePatch.py?rev=45325&r1=45324&r2=45325&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/ZopePatch.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/ZopePatch.py [utf8] Tue Apr 12 11:50:22 2011
@@ -55,6 +55,7 @@ from Products.ERP5Type.patches import OF
 from Products.ERP5Type.patches import PersistentMapping
 from Products.ERP5Type.patches import DateTimePatch
 from Products.ERP5Type.patches import PythonScript
+from Products.ERP5Type.patches import MailHost
 from Products.ERP5Type.patches import MailTemplates
 from Products.ERP5Type.patches import http_server
 from Products.ERP5Type.patches import memcache_client

Added: erp5/trunk/products/ERP5Type/patches/MailHost.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/patches/MailHost.py?rev=45325&view=auto
==============================================================================
--- erp5/trunk/products/ERP5Type/patches/MailHost.py (added)
+++ erp5/trunk/products/ERP5Type/patches/MailHost.py [utf8] Tue Apr 12 11:50:22 2011
@@ -0,0 +1,31 @@
+##############################################################################
+#
+# Copyright (c) 2002 Zope Foundation and Contributors.
+# Copyright (c) 2011 Nexedi SARL and Contributors.
+# All Rights Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+#
+##############################################################################
+
+"""
+Change default behaviour of MailHost to send mails immediately.
+In ERP5, we have Activity Tool to postpone mail delivery.
+"""
+
+from inspect import getargspec, isfunction
+from Products.MailHost.MailHost import MailBase
+
+for f in MailBase.__dict__.itervalues():
+  if isfunction(f):
+    args, _, _, defaults = getargspec(f)
+    try:
+      i = args.index('immediate') - len(args)
+    except ValueError:
+      continue
+    f.func_defaults = defaults[:i] + (True,) + defaults[i+1:]