From 00ff6d07330028da370c869e3ec442eb76f8cbb8 Mon Sep 17 00:00:00 2001 From: Justus Winter Date: Tue, 24 May 2016 17:57:10 +0200 Subject: python: Improve and test Context.wait. * lang/python/pyme/core.py (Context.wait): Improve docstring. As the context passed to 'gpgme_wait' is never NULL, it is pointless to look at the returned context. Always raise exceptions. * lang/python/tests/Makefile.am (pytests): Add new test. * lang/python/tests/t-wait.py: New file. Signed-off-by: Justus Winter --- lang/python/pyme/core.py | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) (limited to 'lang/python/pyme/core.py') diff --git a/lang/python/pyme/core.py b/lang/python/pyme/core.py index aca5ec2d..5f8378de 100644 --- a/lang/python/pyme/core.py +++ b/lang/python/pyme/core.py @@ -316,23 +316,17 @@ class Context(GpgmeWrapper): errorcheck(pygpgme.gpgme_ctx_set_engine_info(self.wrapped, proto, file_name, home_dir)) def wait(self, hang): - """Wait for asynchronous call to finish. Wait forever if hang is True + """Wait for asynchronous call to finish. Wait forever if hang is True. + Raises an exception on errors. - Return: - On an async call completion its return status. - On timeout - None. + Please read the GPGME manual for more information. - Please read the GPGME manual for more information.""" + """ ptr = pygpgme.new_gpgme_error_t_p() - context = pygpgme.gpgme_wait(self.wrapped, ptr, hang) + pygpgme.gpgme_wait(self.wrapped, ptr, hang) status = pygpgme.gpgme_error_t_p_value(ptr) pygpgme.delete_gpgme_error_t_p(ptr) - - if context == None: - errorcheck(status) - return None - else: - return status + errorcheck(status) def op_edit(self, key, func, fnc_value, out): """Start key editing using supplied callback function""" -- cgit v1.2.3