From: Floris Bruynooghe <flub@devork.be>
To: notmuch@notmuchmail.org
Subject: [PATCH] Fix error message when using notmuch_status_to_string
Date: Sat, 6 Nov 2021 12:02:37 +0100 [thread overview]
Message-ID: <20211106110236.69734-2-flub@devork.be> (raw)
In-Reply-To: <20211106110236.69734-1-flub@devork.be>
The python exception class was incorrectly loading the error message
which resulted in unprintable exception objects.
---
bindings/python-cffi/notmuch2/_errors.py | 3 ++-
bindings/python-cffi/tests/test_errors.py | 8 ++++++++
2 files changed, 10 insertions(+), 1 deletion(-)
create mode 100644 bindings/python-cffi/tests/test_errors.py
diff --git a/bindings/python-cffi/notmuch2/_errors.py b/bindings/python-cffi/notmuch2/_errors.py
index f55cc96b..17c3ad9c 100644
--- a/bindings/python-cffi/notmuch2/_errors.py
+++ b/bindings/python-cffi/notmuch2/_errors.py
@@ -83,7 +83,8 @@ class NotmuchError(Exception):
if self.message:
return self.message
elif self.status:
- return capi.lib.notmuch_status_to_string(self.status)
+ char_str = capi.lib.notmuch_status_to_string(self.status)
+ return capi.ffi.string(char_str).decode(errors='replace')
else:
return 'Unknown error'
diff --git a/bindings/python-cffi/tests/test_errors.py b/bindings/python-cffi/tests/test_errors.py
new file mode 100644
index 00000000..c2519f86
--- /dev/null
+++ b/bindings/python-cffi/tests/test_errors.py
@@ -0,0 +1,8 @@
+from notmuch2 import _capi as capi
+from notmuch2 import _errors as errors
+
+def test_status_no_message():
+ exc = errors.NotmuchError(capi.lib.NOTMUCH_STATUS_PATH_ERROR)
+ assert exc.status == capi.lib.NOTMUCH_STATUS_PATH_ERROR
+ assert exc.message is None
+ assert str(exc) == 'Path supplied is illegal for this function'
--
2.33.0
next prev parent reply other threads:[~2021-11-06 11:03 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-06 11:02 Fix python exception object string repr Floris Bruynooghe
2021-11-06 11:02 ` Floris Bruynooghe [this message]
2021-12-05 13:05 ` David Bremner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211106110236.69734-2-flub@devork.be \
--to=flub@devork.be \
--cc=notmuch@notmuchmail.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).