From 1bdad5bcf1742b279ba0a2840aec526e4f6175a7 Mon Sep 17 00:00:00 2001 From: Zara Gebru Date: Fri, 8 Apr 2016 15:42:09 +0200 Subject: Issue #431: extractes the generic handling for error callbacks in init and handles login, logout, mail and tags resources --- service/pixelated/resources/mail_resource.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'service/pixelated/resources/mail_resource.py') diff --git a/service/pixelated/resources/mail_resource.py b/service/pixelated/resources/mail_resource.py index 37fceb9b..6f9ec828 100644 --- a/service/pixelated/resources/mail_resource.py +++ b/service/pixelated/resources/mail_resource.py @@ -4,7 +4,7 @@ from twisted.python.log import err from twisted.web.resource import Resource from twisted.web.server import NOT_DONE_YET -from pixelated.resources import respond_json_deferred, BaseResource +from pixelated.resources import respond_json_deferred, BaseResource, GenericDeferredErrorHandler from pixelated.support import replier @@ -30,7 +30,7 @@ class MailTags(Resource): return NOT_DONE_YET -class Mail(Resource): +class Mail(Resource, GenericDeferredErrorHandler): def __init__(self, mail_id, mail_service): Resource.__init__(self) @@ -51,6 +51,8 @@ class Mail(Resource): d = self._mail_service.mail(self._mail_id) d.addCallback(lambda mail: populate_reply(mail)) d.addCallback(lambda mail_dict: respond_json_deferred(mail_dict, request)) + d.addErrback(self.generic_error_handling, request) + return NOT_DONE_YET def render_DELETE(self, request): -- cgit v1.2.3