Fix #261: Ensure fingerprint and keygrip are added to subkey_info.

Author: vsajip

README.rst

@@ -77,6 +77,7 @@ Change log
 
 Released: Not yet
 
+* Fix #261: Ensure fingerprint and keygrip are added to subkey_info.
 
 0.5.5
 -----

gnupg.py

@@ -1865,7 +1865,18 @@ def list_keys(self, secret=False, keys=None, sigs=False):
                 keys = [keys]
             args.extend(keys)
         p = self._open_subprocess(args)
-        return self._get_list_output(p, 'list')
+        result = self._get_list_output(p, 'list')
+        # Fix up subkey_info with fingerprint and grip values
+        for key in result:
+            # import pdb; pdb.set_trace()
+            subkeys = key['subkeys']
+            subkey_info = key.get('subkey_info')
+            if subkey_info:
+                for sk in subkeys:
+                    skid, capability, fp, grp = sk
+                    subkey_info[skid]['fingerprint'] = fp
+                    subkey_info[skid]['keygrip'] = grp
+        return result
 
     def scan_keys(self, filename):
         """

test_gnupg.py

@@ -431,6 +431,16 @@ def test_add_subkey(self):
                                      usage='sign',
                                      expire=0)
         self.assertEqual(0, result.returncode, 'Non-zero return code')
+        pubkeys = self.gpg.list_keys()
+        for key in pubkeys:
+            sklist = key['subkeys']
+            skmap = key['subkey_info']
+            self.assertEqual(len(sklist), 1)
+            self.assertTrue(len(skmap), 1)
+            for sk in sklist:
+                skid, capability, fp, grp = sk
+                self.assertEqual(skmap[skid]['fingerprint'], fp)
+                self.assertEqual(skmap[skid]['keygrip'], grp)
 
     def test_add_subkey_with_invalid_key_type(self):
         "Test that subkey generation handles invalid key type"
@@ -1627,7 +1637,7 @@ def test_exception_propagation(self):
     'basic':
     set(['test_environment', 'test_list_keys_initial', 'test_nogpg', 'test_make_args', 'test_quote_with_shell']),
     'test':
-    set(['test_filenames_with_spaces']),
+    set(['test_add_subkey']),
 }