From 2be8cb1fe644ab390832405d4c32af1b573fe1af Mon Sep 17 00:00:00 2001 From: Isis Lovecruft Date: Tue, 28 May 2013 05:51:47 +0000 Subject: [PATCH 1/2] Fix error in module docstring which had the wrong version we forked from. --- src/gnupg.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gnupg.py b/src/gnupg.py index 7158ff5..b2375f3 100644 --- a/src/gnupg.py +++ b/src/gnupg.py @@ -16,10 +16,10 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU Affero General Public License for more details. """gnupg.py -======== +=========== A Python interface to GnuPG. -This is a modified version of python-gnupg-0.3.0, which was created by Vinay +This is a modified version of python-gnupg-0.3.2, which was created by Vinay Sajip, which itself is a modification of GPG.py written by Steve Traugott, which in turn is a modification of the pycrypto GnuPG interface written by A.M. Kuchling. From 45d714a73abb7563884f7f4aae5a3daf0848da9b Mon Sep 17 00:00:00 2001 From: Isis Lovecruft Date: Fri, 28 Jun 2013 02:31:37 +0000 Subject: [PATCH 2/2] Fix upstream issue #62, handle expired keys. * see https://code.google.com/p/python-gnupg/issues/detail?id=62 --- src/_parsers.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/_parsers.py b/src/_parsers.py index 3d5c1d5..9628f27 100644 --- a/src/_parsers.py +++ b/src/_parsers.py @@ -775,11 +775,15 @@ class Sign(object): """ if key in ("USERID_HINT", "NEED_PASSPHRASE", "BAD_PASSPHRASE", "GOOD_PASSPHRASE", "BEGIN_SIGNING", "CARDCTRL", - "INV_SGNR"): + "INV_SGNR", "SIGEXPIRED"): pass elif key == "SIG_CREATED": (self.sig_type, self.sig_algo, self.sig_hash_algo, self.what, self.timestamp, self.fingerprint) = value.split() + elif key == "KEYEXPIRED": + self.status = "skipped signing key, key expired" + if (value is not None) and (len(value) > 0): + self.status += " on {}".format(str(value)) elif key == "NODATA": self.status = nodata(value) else: