From 2a613e87156b23c4aa6aa5ce38505cb285de6a18 Mon Sep 17 00:00:00 2001 From: Justus Winter Date: Fri, 5 Aug 2016 14:03:15 +0200 Subject: python: Clean up and modernize examples. * lang/python/examples/Examples.rst: Delete file. * lang/python/examples/t-edit.py: Likewise. This is actually a test case and has been moved to 'tests'. * lang/python/examples/assuan.py: New file. * lang/python/examples/decryption-filter.py: Likewise. * lang/python/examples/delkey.py: Modernize. * lang/python/examples/encrypt-to-all.py: Likewise. * lang/python/examples/exportimport.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/testCMSgetkey.py: Likewise. * lang/python/examples/verifydetails.py: Likewise. Signed-off-by: Justus Winter --- lang/python/examples/delkey.py | 45 +++++++++++++++++++----------------------- 1 file changed, 20 insertions(+), 25 deletions(-) (limited to 'lang/python/examples/delkey.py') diff --git a/lang/python/examples/delkey.py b/lang/python/examples/delkey.py index 3fb71eb4..e607f219 100755 --- a/lang/python/examples/delkey.py +++ b/lang/python/examples/delkey.py @@ -1,35 +1,30 @@ #!/usr/bin/env python3 +# +# Copyright (C) 2016 g10 Code GmbH # Copyright (C) 2004,2008 Igor Belyi # -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. # -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -# 02111-1307 USA +# You should have received a copy of the GNU General Public License +# along with this program; if not, see . # Sample of key deletion -# It deletes keys for joe@example.org generated by genkey.pl script - -from pyme import core +# It deletes keys for joe@example.org generated by genkey.py script -core.check_version(None) +import pyme -# Note that we need to collect all keys out of the iterator return by -# c.op_keylist_all() method before starting to delete them. If you -# delete a key in the middle of iteration c.op_keylist_next() will -# raise INV_VALUE exception +with pyme.Context() as c: + # Note: We must not modify the key store during iteration, + # therefore, we explicitly make a list. + keys = list(c.keylist("joe+pyme@example.org")) -c = core.Context() -# 0 in keylist means to list not only public but secret keys as well. -for thekey in [x for x in c.op_keylist_all("joe+pyme@example.org", 0)]: - # 1 in delete means to delete not only public but secret keys as well. - c.op_delete(thekey, 1) + for k in keys: + c.op_delete(k, True) -- cgit v1.2.3