diff options
| author | Alon Levy <alon@pobox.com> | 2015-01-13 12:27:11 +0200 |
|---|---|---|
| committer | Alon Levy <alon@pobox.com> | 2015-01-13 12:28:57 +0200 |
| commit | 3d4a5fbafa59cc41bce0befc29bb2c2d85807f20 (patch) | |
| tree | 04aa5098fe0d709cfad392baaf02a198f2f626cf | |
| parent | f99aad64bdc69f82bcdcfefedf3a172c6bb23743 (diff) | |
server: remove dependency on magic, hardcode mime types
| -rw-r--r-- | src/server/rz_feedback.py | 4 | ||||
| -rw-r--r-- | src/server/rz_mail.py | 12 |
2 files changed, 4 insertions, 12 deletions
diff --git a/src/server/rz_feedback.py b/src/server/rz_feedback.py index 677814db..7c0f8b0b 100644 --- a/src/server/rz_feedback.py +++ b/src/server/rz_feedback.py @@ -50,8 +50,8 @@ Left note: subject="User feedback from Rhizi", body=feedback_body, attachments=[ - ('feedback_screenshot.png', img), - ('feedback_page.html', html), + ('feedback_screenshot.png', 'image/png', img), + ('feedback_page.html', 'text/html', html), ]) return "{}" # expects json encoded, contents discarded diff --git a/src/server/rz_mail.py b/src/server/rz_mail.py index 0ecf1d61..e512ed91 100644 --- a/src/server/rz_mail.py +++ b/src/server/rz_mail.py @@ -1,15 +1,7 @@ -import magic - from flask_mail import Mail, Message mail = None -magic_mime = magic.open(magic.MAGIC_MIME) -magic_mime.load() - -def mimetype(data): - return magic_mime.buffer(data).split(';')[0] - def init_mail(webapp): global mail mail = Mail(webapp) @@ -21,7 +13,7 @@ def send_message(recipients, subject, attachments, body): """ msg = Message(subject, recipients=recipients) msg.body = body - for filename, data in attachments: - msg.attach(filename=filename, content_type=mimetype(data), data=data) + for filename, mimetype, data in attachments: + msg.attach(filename=filename, content_type=mimetype, data=data) mail.send(msg) |