diff options
| -rw-r--r-- | lang/python/pyme/core.py | 17 | ||||
| -rwxr-xr-x | lang/python/tests/t-idiomatic.py | 19 |
2 files changed, 29 insertions, 7 deletions
diff --git a/lang/python/pyme/core.py b/lang/python/pyme/core.py index 71c6828a..4b3e08a4 100644 --- a/lang/python/pyme/core.py +++ b/lang/python/pyme/core.py @@ -147,8 +147,15 @@ class Context(GpgmeWrapper): self._free_passcb() self._free_progresscb() self._free_statuscb() - if self.own and pygpgme.gpgme_release: + if self.own and self.wrapped and pygpgme.gpgme_release: pygpgme.gpgme_release(self.wrapped) + self.wrapped = None + + # Implement the context manager protocol. + def __enter__(self): + return self + def __exit__(self, type, value, tb): + self.__del__() def _free_passcb(self): if self.last_passcb != None: @@ -420,10 +427,16 @@ class Data(GpgmeWrapper): if self.wrapped != None and pygpgme.gpgme_data_release: pygpgme.gpgme_data_release(self.wrapped) if self._callback_excinfo: - print(self._callback_excinfo) pygpgme.pygpgme_raise_callback_exception(self) + self.wrapped = None self._free_datacbs() + # Implement the context manager protocol. + def __enter__(self): + return self + def __exit__(self, type, value, tb): + self.__del__() + def _free_datacbs(self): if self.data_cbs != None: if pygpgme.pygpgme_clear_generic_cb: diff --git a/lang/python/tests/t-idiomatic.py b/lang/python/tests/t-idiomatic.py index 05a377e4..37cfb64a 100755 --- a/lang/python/tests/t-idiomatic.py +++ b/lang/python/tests/t-idiomatic.py @@ -23,7 +23,15 @@ from pyme import core, constants, errors import support support.init_gpgme(constants.PROTOCOL_OpenPGP) -c = core.Context() + +# Both Context and Data can be used as context manager: +with core.Context() as c, core.Data() as d: + c.get_engine_info() + d.write(b"Halloechen") + leak_c = c + leak_d = d +assert leak_c.wrapped == None +assert leak_d.wrapped == None # Demonstrate automatic wrapping of file-like objects with 'fileno' # method. @@ -33,10 +41,11 @@ with tempfile.TemporaryFile() as source, \ source.write(b"Hallo Leute\n") source.seek(0, os.SEEK_SET) - c.op_sign(source, signed, constants.SIG_MODE_NORMAL) - signed.seek(0, os.SEEK_SET) - c.op_verify(signed, None, sink) - result = c.op_verify_result() + with core.Context() as c: + c.op_sign(source, signed, constants.SIG_MODE_NORMAL) + signed.seek(0, os.SEEK_SET) + c.op_verify(signed, None, sink) + result = c.op_verify_result() assert len(result.signatures) == 1, "Unexpected number of signatures" sig = result.signatures[0] |