wrong merge
authorSylvain Thénault <sylvain.thenault@logilab.fr>
Wed, 02 Sep 2009 10:22:47 +0200
changeset 3083 3084bc9ccc64
parent 3072 6fb42c53f6df
child 3085 b415bca9a9ed
wrong merge
sobjects/notification.py
--- a/sobjects/notification.py	Mon Aug 31 19:09:54 2009 +0200
+++ b/sobjects/notification.py	Wed Sep 02 10:22:47 2009 +0200
@@ -19,8 +19,6 @@
 from cubicweb.common.mail import NotificationView
 from cubicweb.server.hookhelper import SendMailOp
 
-parse_message_id = deprecated('parse_message_id is now defined in cubicweb.common.mail')(parse_message_id)
-
 
 class RecipientsFinder(Component):
     """this component is responsible to find recipients of a notification
@@ -126,4 +124,5 @@
 
 NormalizedTextView = class_renamed('NormalizedTextView', ContentAddedView)
 RenderAndSendNotificationView = class_moved(RenderAndSendNotificationView)
-parse_message_id = deprecated('parse_message_id is now defined in cubicweb.common.mail')
+parse_message_id = deprecated('parse_message_id is now defined in cubicweb.common.mail')(parse_message_id)
+