Better return values from list_keys, list_secret_keys, and list_sigs

mailpile · Dec 20, 2013 · 5199d78 · 5199d78
1 parent a972a1d
commit 5199d78
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/mailpile/gpgi.py b/mailpile/gpgi.py
@@ -509,14 +509,14 @@ def list_keys(self):
         >>> g.list_keys()[0]
         0
         """
-        returncode, retvals = self.run(["--list-keys", "--fingerprint"], 
+        retvals = self.run(["--list-keys", "--fingerprint"], 
                            callbacks={"stdout": self.parse_keylist})
-        return retvals["stdout"][0]
+        return retvals[1]["stdout"][0]
 
     def list_sigs(self):
         retvals = self.run(["--list-sigs", "--fingerprint"], 
                  callbacks={"stdout": self.parse_keylist})
-        return retvals
+        return retvals[1]["stdout"][0]
 
     def list_secret_keys(self):
         """
@@ -526,7 +526,7 @@ def list_secret_keys(self):
         """
         retvals = self.run(["--list-secret-keys", "--fingerprint"], 
                            callbacks={"stdout": self.parse_keylist})
-        return retvals
+        return retvals[1]["stdout"][0]
 
     def encrypt(self, data, tokeys=[], armor=True):
         """