mirror of
https://github.com/void-linux/void-packages.git
synced 2025-06-05 06:33:50 +02:00
alot: update to 0.10.
This commit is contained in:
parent
562d2e3d3b
commit
0cb1147d65
2 changed files with 5 additions and 70 deletions
|
@ -1,65 +0,0 @@
|
||||||
From 0339a33818adc6fc33e83336f9eea289d5e7e893 Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?M=C4=81rti=C5=86=C5=A1=20Ma=C4=8Ds?= <martins.macs@bi.lv>
|
|
||||||
Date: Tue, 19 May 2020 13:48:17 +0300
|
|
||||||
Subject: [PATCH] Fix mailcap rendering for e-mails without `Content-Type`
|
|
||||||
header
|
|
||||||
|
|
||||||
`get_params()` returns `None` when the header is missing. Use `failobj`
|
|
||||||
argument to mitigate that.
|
|
||||||
|
|
||||||
Fixes #1512
|
|
||||||
---
|
|
||||||
alot/db/utils.py | 2 +-
|
|
||||||
tests/db/test_utils.py | 10 ++++++++++
|
|
||||||
tests/static/mail/basic.eml | 5 +++++
|
|
||||||
3 files changed, 16 insertions(+), 1 deletion(-)
|
|
||||||
create mode 100644 tests/static/mail/basic.eml
|
|
||||||
|
|
||||||
diff --git a/alot/db/utils.py b/alot/db/utils.py
|
|
||||||
index 27c85942..e55768b1 100644
|
|
||||||
--- a/alot/db/utils.py
|
|
||||||
+++ b/alot/db/utils.py
|
|
||||||
@@ -365,7 +365,7 @@ def render_part(part, field_key='copiousoutput'):
|
|
||||||
stdin = raw_payload
|
|
||||||
|
|
||||||
# read parameter, create handler command
|
|
||||||
- parms = tuple('='.join(p) for p in part.get_params())
|
|
||||||
+ parms = tuple('='.join(p) for p in part.get_params(failobj=[]))
|
|
||||||
|
|
||||||
# create and call external command
|
|
||||||
cmd = mailcap.subst(entry['view'], ctype,
|
|
||||||
diff --git a/tests/db/test_utils.py b/tests/db/test_utils.py
|
|
||||||
index 36ce77cf..40c2fb91 100644
|
|
||||||
--- a/tests/db/test_utils.py
|
|
||||||
+++ b/tests/db/test_utils.py
|
|
||||||
@@ -762,6 +762,16 @@ class TestExtractBodyPart(unittest.TestCase):
|
|
||||||
|
|
||||||
self.assertEqual(actual, expected)
|
|
||||||
|
|
||||||
+ @mock.patch('alot.db.utils.settings.mailcap_find_match',
|
|
||||||
+ mock.Mock(return_value=(None, {'view': 'cat'})))
|
|
||||||
+ def test_plaintext_mailcap_wo_content_type(self):
|
|
||||||
+ with open('tests/static/mail/basic.eml') as fp:
|
|
||||||
+ mail = email.message_from_file(fp,
|
|
||||||
+ _class=email.message.EmailMessage)
|
|
||||||
+ body_part = utils.get_body_part(mail)
|
|
||||||
+ actual = utils.extract_body_part(body_part)
|
|
||||||
+ expected = 'test body\n'
|
|
||||||
+ self.assertEqual(actual, expected)
|
|
||||||
|
|
||||||
class TestRemoveCte(unittest.TestCase):
|
|
||||||
|
|
||||||
diff --git a/tests/static/mail/basic.eml b/tests/static/mail/basic.eml
|
|
||||||
new file mode 100644
|
|
||||||
index 00000000..95f15693
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/tests/static/mail/basic.eml
|
|
||||||
@@ -0,0 +1,5 @@
|
|
||||||
+From: me@localhost
|
|
||||||
+To: you@localhost
|
|
||||||
+Subject: test subject
|
|
||||||
+
|
|
||||||
+test body
|
|
||||||
--
|
|
||||||
2.29.2
|
|
||||||
|
|
|
@ -1,10 +1,10 @@
|
||||||
# Template file for 'alot'
|
# Template file for 'alot'
|
||||||
pkgname=alot
|
pkgname=alot
|
||||||
version=0.9.1
|
version=0.10
|
||||||
revision=8
|
revision=1
|
||||||
build_style=python3-module
|
build_style=python3-module
|
||||||
hostmakedepends="python3-setuptools python3-Sphinx"
|
hostmakedepends="python3-setuptools python3-Sphinx python3-notmuch2 python3-cffi"
|
||||||
depends="python3-setuptools python3-Twisted notmuch-python3 python3-configobj
|
depends="python3-setuptools python3-Twisted python3-notmuch2 python3-configobj
|
||||||
gpgme-python3 python3-magic python3-urwidtrees"
|
gpgme-python3 python3-magic python3-urwidtrees"
|
||||||
checkdepends="$depends gnupg2 procps-ng python3-pytest"
|
checkdepends="$depends gnupg2 procps-ng python3-pytest"
|
||||||
short_desc="Terminal-based mail user agent based on the notmuch mail indexer"
|
short_desc="Terminal-based mail user agent based on the notmuch mail indexer"
|
||||||
|
@ -12,7 +12,7 @@ maintainer="Felix Van der Jeugt <felix.vanderjeugt@posteo.net>"
|
||||||
license="GPL-3.0-or-later"
|
license="GPL-3.0-or-later"
|
||||||
homepage="https://github.com/pazz/alot"
|
homepage="https://github.com/pazz/alot"
|
||||||
distfiles="https://github.com/pazz/${pkgname}/archive/${version}.tar.gz"
|
distfiles="https://github.com/pazz/${pkgname}/archive/${version}.tar.gz"
|
||||||
checksum=ee2c1ab1b43d022a8fe2078820ed57d8d72aec260a7d750776dac4ee841d1de4
|
checksum=71f382aa751fb90fde1a06a0a4ba43628ee6aa6d41b5cd53c8701fd7c5ab6e6e
|
||||||
|
|
||||||
do_check() {
|
do_check() {
|
||||||
pytest3 -k 'not test_no_spawn_no_stdin_attached'
|
pytest3 -k 'not test_no_spawn_no_stdin_attached'
|
||||||
|
|
Loading…
Add table
Reference in a new issue