Skip to content

Don't include a Content-Disposition header when cid is provided #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
emtrane wants to merge 1 commit into from
Closed

Don't include a Content-Disposition header when cid is provided #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions sendgrid/transport/smtp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,9 +180,9 @@ def _getFileMIME(self, attach):
msg.set_payload(data)
encoders.encode_base64(msg)

msg.add_header('Content-Disposition', 'attachment', filename=filename)

if attach.get('cid', False):
msg.add_header('Content-ID', '<%s>' % attach['cid'])
msg.add_header('Content-ID', '<%s>' % attach['cid'])
else:
msg.add_header('Content-Disposition', 'attachment', filename=filename)

return msg
3 changes: 3 additions & 0 deletions test/test_smtp_transport.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,15 @@ def test_smtp_transport_content_id_header(self):

f = smtp_transport._getFileMIME({'file': 'img.png', 'name': 'contents'})
self.assertEqual(None, f.get('Content-ID'))
self.assertEqual('attachment; filename="contents"', f.get('Content-Disposition'))

f = smtp_transport._getFileMIME({'file': 'img.png', 'name': 'contents', 'cid': None})
self.assertEqual(None, f.get('Content-ID'))
self.assertEqual('attachment; filename="contents"', f.get('Content-Disposition'))

f = smtp_transport._getFileMIME({'file': 'img.png', 'name': 'contents', 'cid': 'cid'})
self.assertEqual('<cid>', f.get('Content-ID'))
self.assertEqual(None, f.get('Content-Disposition'))


class FakeException(IOError):
Expand Down