From b829fa5267060528469e70d7d5861450020100d5 Mon Sep 17 00:00:00 2001 From: Bruno Wagner Date: Wed, 15 Oct 2014 14:53:58 +0200 Subject: Moved input mail from dict to input mail instead of floating elsewhere --- service/pixelated/adapter/pixelated_mail.py | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) (limited to 'service/pixelated/adapter') diff --git a/service/pixelated/adapter/pixelated_mail.py b/service/pixelated/adapter/pixelated_mail.py index f701e648..6be2e5bf 100644 --- a/service/pixelated/adapter/pixelated_mail.py +++ b/service/pixelated/adapter/pixelated_mail.py @@ -46,10 +46,6 @@ class InputMail: 'body': self.body } - @staticmethod - def from_dict(mail_dict): - return input_mail_from_dict(mail_dict) - @property def _mime_multipart(self): if self._mime: @@ -148,6 +144,16 @@ class InputMail: mime_multipart['From'] = PixelatedMail.from_email_address return mime_multipart.as_string() + @staticmethod + def from_dict(mail_dict): + input_mail = InputMail() + input_mail.headers = {key.capitalize(): value for key, value in mail_dict.get('header', {}).items()} + input_mail.headers['Date'] = pixelated.support.date.iso_now() + input_mail.body = mail_dict.get('body', '') + input_mail.tags = set(mail_dict.get('tags', [])) + input_mail.status = set(mail_dict.get('status', [])) + return input_mail + class PixelatedMail: @@ -287,13 +293,3 @@ class PixelatedMail: 'security_casing': self.security_casing, 'body': self.body } - - -def input_mail_from_dict(mail_dict): - input_mail = InputMail() - input_mail.headers = {key.capitalize(): value for key, value in mail_dict.get('header', {}).items()} - input_mail.headers['Date'] = pixelated.support.date.iso_now() - input_mail.body = mail_dict.get('body', '') - input_mail.tags = set(mail_dict.get('tags', [])) - input_mail.status = set(mail_dict.get('status', [])) - return input_mail -- cgit v1.2.3