From a919d12ddb7c688c2e7fb01b8768dab8be9f5c39 Mon Sep 17 00:00:00 2001 From: Felix Hammerl Date: Wed, 13 Apr 2016 16:25:28 +0200 Subject: Issue #431: Review * Remove GenericDeferredErrorHandler class * Convert static method generic_error_handling to function instead --- service/pixelated/resources/mail_resource.py | 6 +++--- 1 file changed, 3 insertions(+), 3 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 6f9ec828..58bc7756 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, GenericDeferredErrorHandler +from pixelated.resources import respond_json_deferred, BaseResource, handle_error_deferred from pixelated.support import replier @@ -30,7 +30,7 @@ class MailTags(Resource): return NOT_DONE_YET -class Mail(Resource, GenericDeferredErrorHandler): +class Mail(Resource): def __init__(self, mail_id, mail_service): Resource.__init__(self) @@ -51,7 +51,7 @@ class Mail(Resource, GenericDeferredErrorHandler): 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) + d.addErrback(handle_error_deferred, request) return NOT_DONE_YET -- cgit v1.2.3