Permalink
Browse files

commit 0.3.0 upstream release from http://code.google.com/p/python-gn…

  • Loading branch information...
1 parent bebf31e commit bef5ee2a94870084dfcba2ab507dd1656ff24674 Daniel Folkinshteyn committed Jul 18, 2012
Showing with 9 additions and 5 deletions.
  1. +1 −1 PKG-INFO
  2. +8 −4 gnupg.py
View
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: python-gnupg
-Version: 0.2.9
+Version: 0.3.0
Summary: A wrapper for the Gnu Privacy Guard (GPG or GnuPG)
Home-page: http://www.red-dove.com/python_gnupg.html
Author: Vinay Sajip
View
@@ -33,9 +33,9 @@
"""
import locale
-__version__ = "0.2.9"
+__version__ = "0.3.0"
__author__ = "Vinay Sajip"
-__date__ = "$29-Mar-2012 21:12:58$"
+__date__ = "$12-May-2012 10:49:10$"
try:
from io import StringIO
@@ -287,7 +287,6 @@ class ListKeys(list):
crt = X.509 certificate
crs = X.509 certificate and private key available
- sub = subkey (secondary key)
ssb = secret subkey (secondary key)
uat = user attribute (same as user id except for field 10).
sig = signature
@@ -313,6 +312,7 @@ def key(self, args):
if self.curkey['uid']:
self.curkey['uids'].append(self.curkey['uid'])
del self.curkey['uid']
+ self.curkey['subkeys'] = []
self.append(self.curkey)
pub = sec = key
@@ -325,6 +325,10 @@ def uid(self, args):
self.curkey['uids'].append(args[9])
self.uids.append(args[9])
+ def sub(self, args):
+ subkey = [args[4], args[11]]
+ self.curkey['subkeys'].append(subkey)
+
def handle_status(self, key, value):
pass
@@ -830,7 +834,7 @@ def list_keys(self, secret=False):
self._collect_output(p, result, stdin=p.stdin)
lines = result.data.decode(self.encoding,
self.decode_errors).splitlines()
- valid_keywords = 'pub uid sec fpr'.split()
+ valid_keywords = 'pub uid sec fpr sub'.split()
for line in lines:
if self.verbose:
print(line)

0 comments on commit bef5ee2

Please sign in to comment.