entrouvert
/
python-emails
Archived
17
0
Fork 0
Code Issues Pull Requests Releases Activity

Headers in attachments

This commit is contained in:
Sergey Lavrinenko 2015-03-11 17:24:30 +03:00
parent ef535eb519
commit 626e0e74b4
2 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
emails/store/file.py
View File

@ -38,7 +38,7 @@ class BaseFile(object):
self.filename = kwargs.get('filename', None)
self.data = kwargs.get('data', None)
self._mime_type = kwargs.get('mime_type')
self._headers = kwargs.get('headers')
self._headers = kwargs.get('headers', {})
self._content_id = kwargs.get('content_id')
self._content_disposition = kwargs.get('content_disposition', 'attachment')
self.subtype = kwargs.get('subtype')
@ -133,18 +133,23 @@ class BaseFile(object):
@property
def mime(self):
if self.content_disposition is None:
content_disposition = self.content_disposition
if content_disposition is None:
return None
_mime = getattr(self, '_cached_mime', None)
if _mime is None:
p = getattr(self, '_cached_part', None)
if p is None:
filename_header = encode_header(self.filename)
self._cached_mime = _mime = MIMEBase(*self.mime_type.split('/', 1), name=filename_header)
_mime.set_payload(to_bytes(self.data))
encode_base64(_mime)
_mime.add_header('Content-Disposition', self.content_disposition, filename=filename_header)
if self.content_disposition == 'inline':
_mime.add_header('Content-ID', '<%s>' % self.content_id)
return _mime
p = MIMEBase(*self.mime_type.split('/', 1), name=filename_header)
p.set_payload(to_bytes(self.data))
encode_base64(p)
if 'content-disposition' not in self._headers:
p.add_header('Content-Disposition', self.content_disposition, filename=filename_header)
if content_disposition == 'inline' and 'content-id' not in self._headers:
p.add_header('Content-ID', '<%s>' % self.content_id)
for (k, v) in self._headers.items():
p.add_header(k, v)
self._cached_part = p
return p
def reset_mime(self):
self._mime = None

6
emails/testsuite/store/test_store.py
View File

@ -19,6 +19,12 @@ def test_lazy_http():
assert len(f.data) == 2549
def test_attachment_headers():
f = emails.store.BaseFile(data='x', filename='1.txt', headers={'X-Header': 'X'})
part = f.mime.as_string()
assert 'X-Header: X' in part
def test_store_commons():
FILES = [{'data': 'aaa', 'filename': 'aaa.txt'}, {'data': 'bbb', 'filename': 'bbb.txt'}, ]
store = emails.store.MemoryFileStore()