1 |
commit: c2ce0f379d7740dac246d5378bb5746abea8be1f |
2 |
Author: Pavlos Ratis <dastergon <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun May 25 14:46:15 2014 +0000 |
4 |
Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com> |
5 |
CommitDate: Sun May 25 14:46:15 2014 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-keys.git;a=commit;h=c2ce0f37 |
7 |
|
8 |
remove KEYLEN_MAP |
9 |
|
10 |
--- |
11 |
gkeyldap/actions.py | 10 +++++----- |
12 |
gkeyldap/search.py | 3 --- |
13 |
gkeys/config.py | 15 +-------------- |
14 |
3 files changed, 6 insertions(+), 22 deletions(-) |
15 |
|
16 |
diff --git a/gkeyldap/actions.py b/gkeyldap/actions.py |
17 |
index 712f090..7c0608b 100644 |
18 |
--- a/gkeyldap/actions.py |
19 |
+++ b/gkeyldap/actions.py |
20 |
@@ -14,7 +14,7 @@ import os |
21 |
import re |
22 |
|
23 |
from collections import defaultdict |
24 |
-from gkeys.config import GKEY, KEYLEN_MAP |
25 |
+from gkeys.config import GKEY |
26 |
from gkeys.seed import Seeds |
27 |
from gkeyldap.search import (LdapSearch, UID, gkey2ldap_map, gkey2SEARCH) |
28 |
|
29 |
@@ -32,9 +32,9 @@ def get_key_ids(key_len, keyids): |
30 |
''' |
31 |
result = [] |
32 |
for keyid in keyids: |
33 |
- target_len = KEYLEN_MAP[key_len] |
34 |
+ target_len = 16 |
35 |
if keyid.startswith('0x'): |
36 |
- target_len = KEYLEN_MAP[key_len] + 2 |
37 |
+ target_len = target_len + 2 |
38 |
if len(keyid) == target_len: |
39 |
result.append(keyid) |
40 |
return result |
41 |
@@ -155,7 +155,7 @@ class Actions(object): |
42 |
# assume it's good until an error is found |
43 |
is_good = True |
44 |
#self.logger.debug("Actions: build_gkeylist; info = %s" % str(info)) |
45 |
- for attr in GKEY._fields: |
46 |
+ for attr in gkey2ldap_map: |
47 |
field = gkey2ldap_map[attr] |
48 |
if not field: |
49 |
keyinfo[attr] = None |
50 |
@@ -199,7 +199,7 @@ class Actions(object): |
51 |
values = [v.replace(' ', '') for v in values] |
52 |
# assign it to gpgkey to prevent a possible |
53 |
# "gpgkey" undefined error |
54 |
- gpgkey = ['0x' + x[-KEYLEN_MAP['longkeyid']:] for x in values] |
55 |
+ gpgkey = ['0x' + x[-16:] for x in values] |
56 |
keyinfo['longkeyid'] = gpgkey |
57 |
self.logger.debug(' Generate gpgkey, NEW keyinfo[\'fingerprint\'] = %s' |
58 |
% str(keyinfo['longkeyid'])) |
59 |
|
60 |
diff --git a/gkeyldap/search.py b/gkeyldap/search.py |
61 |
index 087bee6..5f2ffbd 100644 |
62 |
--- a/gkeyldap/search.py |
63 |
+++ b/gkeyldap/search.py |
64 |
@@ -36,9 +36,6 @@ gkey2ldap_map = { |
65 |
'keydir': 'uid', |
66 |
'fingerprint': 'gpgfingerprint' |
67 |
} |
68 |
-# Sanity check they are in sync |
69 |
-if not sorted(gkey2ldap_map) == sorted(GKEY._fields): |
70 |
- raise "Search.py out of sync with GKEY class" |
71 |
|
72 |
|
73 |
# Now for some search field defaults |
74 |
|
75 |
diff --git a/gkeys/config.py b/gkeys/config.py |
76 |
index b1a0447..b932fb2 100644 |
77 |
--- a/gkeys/config.py |
78 |
+++ b/gkeys/config.py |
79 |
@@ -110,23 +110,10 @@ class GKeysConfig(GPGConfig): |
80 |
return super(GKeysConfig, self)._get_(key, subkey) |
81 |
|
82 |
|
83 |
-# set some defaults |
84 |
-KEYLEN_MAP = { |
85 |
- 'keyid': 8, |
86 |
- 'longkeyid': 16, |
87 |
-} |
88 |
|
89 |
- |
90 |
-class GKEY(namedtuple('GKEY', ['nick', 'name', 'keyid', 'longkeyid', |
91 |
- 'keydir', 'fingerprint'])): |
92 |
+class GKEY(namedtuple('GKEY', ['nick', 'name', 'keydir', 'fingerprint'])): |
93 |
'''Class to hold the relavent info about a key''' |
94 |
|
95 |
- # subclass __new__ to make both gkeys and gkeyldap work properly |
96 |
- # delete it when keyid and longkeyid are removed from LDAP |
97 |
- def __new__(cls, nick=None, name=None, keydir=None, fingerprint=None, |
98 |
- keyid=None, longkeyid=None): |
99 |
- return super(GKEY, cls).__new__(cls, nick, name, keydir, fingerprint, |
100 |
- keyid, longkeyid) |
101 |
|
102 |
field_types = {'nick': str, 'name': str, 'keyid': list, |
103 |
'longkeyid': list, 'keydir': str, 'fingerprint': list} |