diff options
| author | Felix Hammerl <fhammerl@thoughtworks.com> | 2016-04-13 16:25:28 +0200 |
|---|---|---|
| committer | Felix Hammerl <fhammerl@thoughtworks.com> | 2016-04-13 16:25:28 +0200 |
| commit | a919d12ddb7c688c2e7fb01b8768dab8be9f5c39 (patch) | |
| tree | 7afe6db219c2474f66ccaa5a67afbff6e3ee0d1e /service/pixelated/resources/mail_resource.py | |
| parent | 8c3be1c268626c3ae4eae2ec0fe5d6eadc7c340a (diff) | |
Issue #431: Review
* Remove GenericDeferredErrorHandler class
* Convert static method generic_error_handling to function instead
Diffstat (limited to 'service/pixelated/resources/mail_resource.py')
| -rw-r--r-- | service/pixelated/resources/mail_resource.py | 6 |
1 files changed, 3 insertions, 3 deletions
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 |