From 10328324c8fc9725cd0c885eaebfc80dc32c1ff6 Mon Sep 17 00:00:00 2001 From: Justus Winter Date: Tue, 17 May 2016 14:15:21 +0200 Subject: python: Clean up examples. * lang/python/examples/delkey.py: Clean up example. * lang/python/examples/encrypt-to-all.py: Likewise. * lang/python/examples/genkey.py: Likewise. * lang/python/examples/inter-edit.py: Likewise. * lang/python/examples/sign.py: Likewise. * lang/python/examples/signverify.py: Likewise. * lang/python/examples/simple.py: Likewise. * lang/python/examples/t-edit.py: Likewise. * lang/python/examples/verifydetails.py: Likewise. * lang/python/pyme/__init__.py: Likewise. Signed-off-by: Justus Winter --- lang/python/examples/verifydetails.py | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) (limited to 'lang/python/examples/verifydetails.py') diff --git a/lang/python/examples/verifydetails.py b/lang/python/examples/verifydetails.py index a8d840e7..0aa6f15b 100755 --- a/lang/python/examples/verifydetails.py +++ b/lang/python/examples/verifydetails.py @@ -25,8 +25,8 @@ # along with this program. If not, see . import sys -from pyme import core, callbacks, constants -from pyme.constants.sig import mode +import os +from pyme import core from pyme.constants import protocol def print_engine_infos(): @@ -58,9 +58,7 @@ def verifyprintdetails(sigfilename, filefilename=None): result = c.op_verify_result() # List results for all signatures. Status equal 0 means "Ok". - index = 0 - for sign in result.signatures: - index += 1 + for index, sign in enumerate(result.signatures): print("signature", index, ":") print(" summary: %#0x" % (sign.summary)) print(" status: %#0x" % (sign.status)) @@ -71,8 +69,9 @@ def verifyprintdetails(sigfilename, filefilename=None): # Print "unsigned" text if inline signature if plain2: #Rewind since verify put plain2 at EOF. - plain2.seek(0,0) - print("\n", plain2.read()) + plain2.seek(0, os.SEEK_SET) + print("\n") + sys.stdout.buffer.write(plain2.read()) def main(): print_engine_infos() @@ -86,13 +85,13 @@ def main(): sys.exit(1) if argc == 2: - print("trying to verify file: " + sys.argv[1].encode('utf-8')) - verifyprintdetails(sys.argv[1].encode('utf-8')) + print("trying to verify file: " + sys.argv[1]) + verifyprintdetails(sys.argv[1]) if argc == 3: print("trying to verify signature %s for file %s" \ - % (sys.argv[1].encode('utf-8'), sys.argv[2].encode('utf-8'))) + % (sys.argv[1], sys.argv[2])) - verifyprintdetails(sys.argv[1].encode('utf-8'), sys.argv[2].encode('utf-8')) + verifyprintdetails(sys.argv[1], sys.argv[2]) if __name__ == "__main__": main() -- cgit v1.2.3