| 1 |
commit: 750ec49ff4858d2ad168c91c9c8d465bff30d3b6 |
| 2 |
Author: Pavlos Ratis <dastergon <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu May 22 16:21:17 2014 +0000 |
| 4 |
Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com> |
| 5 |
CommitDate: Sat May 24 17:38:48 2014 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-keys.git;a=commit;h=750ec49f |
| 7 |
|
| 8 |
create namedtuple with default mapping |
| 9 |
|
| 10 |
--- |
| 11 |
gkeys/config.py | 14 -------------- |
| 12 |
gkeys/seed.py | 4 +--- |
| 13 |
2 files changed, 1 insertion(+), 17 deletions(-) |
| 14 |
|
| 15 |
diff --git a/gkeys/config.py b/gkeys/config.py |
| 16 |
index 818f5b1..b20d5cd 100644 |
| 17 |
--- a/gkeys/config.py |
| 18 |
+++ b/gkeys/config.py |
| 19 |
@@ -184,20 +184,6 @@ class GKEY(namedtuple('GKEY', ['nick', 'name', 'keyid', 'longkeyid', |
| 20 |
result = data.split(self.list_separator) |
| 21 |
return result |
| 22 |
|
| 23 |
- def _unpack_dict(self, data): |
| 24 |
- values = [] |
| 25 |
- for attr in self._fields: |
| 26 |
- values.append(data[attr]) |
| 27 |
- return values |
| 28 |
- |
| 29 |
- def make_packed_dict(self, packed_dict): |
| 30 |
- '''Creates a new instance of Gkey from a dictionary |
| 31 |
- |
| 32 |
- @param packed_dict: data inside a dictionary |
| 33 |
- @return new GKEY instance containing the data |
| 34 |
- ''' |
| 35 |
- return GKEY._make(self._unpack_dict(packed_dict)) |
| 36 |
- |
| 37 |
def make_packed(self, packed_string): |
| 38 |
'''Creates a new instance of Gkey from the packed |
| 39 |
value string |
| 40 |
|
| 41 |
diff --git a/gkeys/seed.py b/gkeys/seed.py |
| 42 |
index aebf63d..ecbbf83 100644 |
| 43 |
--- a/gkeys/seed.py |
| 44 |
+++ b/gkeys/seed.py |
| 45 |
@@ -52,11 +52,9 @@ class Seeds(object): |
| 46 |
logger.debug("Seed: load; IOError occurred while loading file") |
| 47 |
self._error(err) |
| 48 |
return False |
| 49 |
- # initialize a dummy instance, so it can make new ones |
| 50 |
- gkey = GKEY._make([None,None,None,None,None,None]) |
| 51 |
for seed in seedlines.items(): |
| 52 |
#try: |
| 53 |
- self.seeds.append(gkey.make_packed_dict(seed[1])) |
| 54 |
+ self.seeds.append(GKEY(**seed[1])) |
| 55 |
#except Exception as err: |
| 56 |
#logger.debug("Seed: load; Error splitting seed: %s" % seed) |
| 57 |
#logger.debug("Seed: load; ...............parts: %s" % str(parts)) |
Archives