commit: 37bdded9136d9417baaa89409ca1f606411932c6
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 5 06:37:31 2015 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Mon Jan 5 22:21:53 2015 +0000
URL:
http://sources.gentoo.org/gitweb/?p=proj/gentoo-keys.git;a=commit;h=37bdded9
gkeys/seed.py: Fix logic errors in _seeds2json
The original code did not correctly handle a mix of dictionary and GKEY values.
---
gkeys/gkeys/seed.py | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/gkeys/gkeys/seed.py b/gkeys/gkeys/seed.py
index a84003d..40bdd46 100644
--- a/gkeys/gkeys/seed.py
+++ b/gkeys/gkeys/seed.py
@@ -229,13 +229,10 @@ class Seeds(object):
def _seeds2json(self, seeds):
- is_gkey = False
if not seeds:
seeds = {}
- elif isinstance(list(seeds.values())[0], GKEY):
- is_gkey = True
for dev, value in list(seeds.items()):
- if is_gkey:
+ if isinstance(value, GKEY):
seeds[dev] = dict(value._asdict())
return json.dumps(seeds, sort_keys=True, indent=4)
