Merge branch 'release/1.0.1'

testing/mmn/mktime_takes_localtime_not_gmtime
Isis Lovecruft 2013-06-28 02:41:19 +00:00
commit 906cbd2305
No known key found for this signature in database
GPG Key ID: A3ADB67A2CDB8B35
2 changed files with 7 additions and 3 deletions

View File

@ -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:

View File

@ -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.