diff options
| author | kaeff <hi@kaeff.net> | 2015-09-07 14:53:55 +0200 |
|---|---|---|
| committer | kaeff <hi@kaeff.net> | 2015-09-07 14:57:04 +0200 |
| commit | 9fb72d4deb4207e1b4569f55f5344e5d7ef9e2eb (patch) | |
| tree | 42ccbfde94765ce8fe0099cbac9f4eaf4ef77ca5 /service/pixelated | |
| parent | ec7fc9004b6c7a25d83dd05f05955574403f65f8 (diff) | |
Remove soledad_querier as parameter of PixelatedMail.from_soledad
Diffstat (limited to 'service/pixelated')
| -rw-r--r-- | service/pixelated/adapter/model/mail.py | 3 | ||||
| -rw-r--r-- | service/pixelated/adapter/soledad/soledad_reader_mixin.py | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/service/pixelated/adapter/model/mail.py b/service/pixelated/adapter/model/mail.py index 53b86aaf..524ca48d 100644 --- a/service/pixelated/adapter/model/mail.py +++ b/service/pixelated/adapter/model/mail.py @@ -275,14 +275,13 @@ class InputMail(Mail): class PixelatedMail(Mail): @staticmethod - def from_soledad(fdoc, hdoc, bdoc, parts=None, soledad_querier=None): + def from_soledad(fdoc, hdoc, bdoc, parts=None): mail = PixelatedMail() mail.parts = parts mail.boundary = str(uuid4()).replace('-', '') mail.bdoc = bdoc mail.fdoc = fdoc mail.hdoc = hdoc - mail.querier = soledad_querier mail._mime = None return mail diff --git a/service/pixelated/adapter/soledad/soledad_reader_mixin.py b/service/pixelated/adapter/soledad/soledad_reader_mixin.py index 58dd9e8e..e86298dd 100644 --- a/service/pixelated/adapter/soledad/soledad_reader_mixin.py +++ b/service/pixelated/adapter/soledad/soledad_reader_mixin.py @@ -56,7 +56,7 @@ class SoledadReaderMixin(SoledadDbFacadeMixin, object): parts = yield self._extract_parts(hdoc.content) fdocs_hdocs_bdocs_parts.append((fdoc, hdoc, bdoc, parts)) - defer.returnValue([PixelatedMail.from_soledad(*raw_mail, soledad_querier=self) for raw_mail in fdocs_hdocs_bdocs_parts]) + defer.returnValue([PixelatedMail.from_soledad(*raw_mail) for raw_mail in fdocs_hdocs_bdocs_parts]) def mail_exists(self, ident): return self.get_flags_by_chash(ident) @@ -68,7 +68,7 @@ class SoledadReaderMixin(SoledadDbFacadeMixin, object): bdoc = yield self.get_content_by_phash(hdoc.content['body']) parts = yield self._extract_parts(hdoc.content) - mail = PixelatedMail.from_soledad(fdoc, hdoc, bdoc, parts=parts, soledad_querier=self) + mail = PixelatedMail.from_soledad(fdoc, hdoc, bdoc, parts=parts) defer.returnValue(mail) @defer.inlineCallbacks |