From 30ddb2cabcd6e24eaa7f73d1ec099ddff5e41646 Mon Sep 17 00:00:00 2001 From: Daniel Kahn Gillmor Date: Wed, 28 Nov 2018 01:51:24 -0500 Subject: [PATCH] python: gpg.Context.decrypt verify_sigs and sink_result are bools Both of these function-internal variables are never used for anything other than a binary state. Implement them as the booleans they are. Otherwise, casual readers of the code might think that they're supposed to represent something other than a flag (e.g. "verify_sigs" could mean "the signatures to verify", and "sink_result" could mean "the place where we sink the result"). Signed-Off-By: Daniel Kahn Gillmor --- lang/python/src/core.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lang/python/src/core.py b/lang/python/src/core.py index 0b7b7e08..87cfd6bf 100644 --- a/lang/python/src/core.py +++ b/lang/python/src/core.py @@ -367,8 +367,8 @@ class Context(GpgmeWrapper): GPGMEError -- as signaled by the underlying library """ - sink_result = None - verify_sigs = None + sink_result = False + verify_sigs = False plaintext = sink if sink else Data() if passphrase is not None: @@ -397,7 +397,7 @@ class Context(GpgmeWrapper): self.op_decrypt(ciphertext, plaintext) except errors.GPGMEError as e: result = self.op_decrypt_result() - if verify is not None and sink_result is None: + if verify is not None and not sink_result: verify_result = self.op_verify_result() else: verify_result = None @@ -412,7 +412,7 @@ class Context(GpgmeWrapper): result = self.op_decrypt_result() - if verify is not None and sink_result is None: + if verify is not None and not sink_result: verify_result = self.op_verify_result() else: verify_result = None @@ -428,7 +428,7 @@ class Context(GpgmeWrapper): for s in verify_result.signatures): raise errors.BadSignatures(verify_result, results=results) - if verify_sigs is not None: + if verify_sigs: missing = [] for key in verify: ok = False