diff options
author | Kali Kaneko <kali@leap.se> | 2015-08-03 14:27:48 -0400 |
---|---|---|
committer | Kali Kaneko <kali@leap.se> | 2015-08-03 14:27:48 -0400 |
commit | a778140a3dfa2907d2e1d45cfa87ee3b2dd5329a (patch) | |
tree | db4b3587b6295730e059279925cbb97fbdb7cb7b /src/leap/mail/imap/server.py | |
parent | f27ad9a3fdb2a6746ddb13fe4c117614c4b59364 (diff) | |
parent | 5027dd2dd3c7679a7eea025d838a7d472c355623 (diff) |
Merge remote-tracking branch 'leapcode/pr/188' into develop
Diffstat (limited to 'src/leap/mail/imap/server.py')
-rw-r--r-- | src/leap/mail/imap/server.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/leap/mail/imap/server.py b/src/leap/mail/imap/server.py index 2b670c1..050521a 100644 --- a/src/leap/mail/imap/server.py +++ b/src/leap/mail/imap/server.py @@ -122,9 +122,9 @@ class LEAPIMAPServer(imap4.IMAP4Server): elif part.text: _w(str(part) + ' ') _f() - return imap4.FileProducer(msg.getBodyFile() - ).beginProducing(self.transport - ) + return imap4.FileProducer( + msg.getBodyFile() + ).beginProducing(self.transport) elif part.mime: hdrs = imap4._formatHeaders(msg.getHeaders(True)) @@ -151,10 +151,10 @@ class LEAPIMAPServer(imap4.IMAP4Server): _fd.seek(0) else: _fd = fd - return imap4.FileProducer(_fd - # END PATCHED #########################3 - ).beginProducing(self.transport - ) + return imap4.FileProducer( + _fd + # END PATCHED #########################3 + ).beginProducing(self.transport) else: mf = imap4.IMessageFile(msg, None) if mf is not None: @@ -459,7 +459,7 @@ class LEAPIMAPServer(imap4.IMAP4Server): mailboxes.addCallback(self._cbSubscribed) mailboxes.addCallback( self._cbListWork, tag, sub, cmdName, - ).addErrback(self._ebListWork, tag) + ).addErrback(self._ebListWork, tag) def _cbSubscribed(self, mailboxes): subscribed = [ |