From e10e43968e2a4a8ef3ef84fd7ff7e741af5e40b0 Mon Sep 17 00:00:00 2001 From: NavaL Date: Thu, 7 Jan 2016 15:39:34 +0100 Subject: renamed attachment_id attribute to ident on POST response, to conform with the GET attachment API Issue #548 --- service/pixelated/resources/attachments_resource.py | 2 +- service/pixelated/resources/mails_resource.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'service/pixelated/resources') diff --git a/service/pixelated/resources/attachments_resource.py b/service/pixelated/resources/attachments_resource.py index e7bb6bdb..51fcdd3e 100644 --- a/service/pixelated/resources/attachments_resource.py +++ b/service/pixelated/resources/attachments_resource.py @@ -87,7 +87,7 @@ class AttachmentsResource(Resource): def send_location(attachment_id): request.headers['Location'] = '/%s/%s' % (self.BASE_URL, attachment_id) - response_json = {"attachment_id": attachment_id, + response_json = {"ident": attachment_id, "content-type": _file.type, "filename": _file.filename, "filesize": len(_file.value)} diff --git a/service/pixelated/resources/mails_resource.py b/service/pixelated/resources/mails_resource.py index f9397263..3a5b6286 100644 --- a/service/pixelated/resources/mails_resource.py +++ b/service/pixelated/resources/mails_resource.py @@ -180,7 +180,7 @@ class MailsResource(Resource): def _fetch_attachment_contents(self, content_dict): attachments = content_dict.get('attachments', []) if content_dict else [] for attachment in attachments: - retrieved_attachment = yield self._mail_service.attachment(attachment['attachment_id']) + retrieved_attachment = yield self._mail_service.attachment(attachment['ident']) attachment['raw'] = retrieved_attachment['content'] content_dict['attachments'] = attachments defer.returnValue(content_dict) -- cgit v1.2.3