diff options
| author | Ruben Pollan <meskio@sindominio.net> | 2015-01-05 08:54:24 -0600 |
|---|---|---|
| committer | Ruben Pollan <meskio@sindominio.net> | 2015-01-15 13:10:57 -0600 |
| commit | 82d027b1f471517213bdcdc773dc8eea677fe330 (patch) | |
| tree | 4e91d829a7185be9cb127592747eb72866d47f77 | |
| parent | 6fa8b2a9e7f02c59f794e9dd080fac574841e50b (diff) | |
Port validation levels to enum34
| -rw-r--r-- | pkg/requirements.pip | 2 | ||||
| -rw-r--r-- | src/leap/keymanager/keys.py | 2 | ||||
| -rw-r--r-- | src/leap/keymanager/tests/test_keymanager.py | 2 | ||||
| -rw-r--r-- | src/leap/keymanager/validation.py | 20 |
4 files changed, 13 insertions, 13 deletions
diff --git a/pkg/requirements.pip b/pkg/requirements.pip index 207483ca..11c42290 100644 --- a/pkg/requirements.pip +++ b/pkg/requirements.pip @@ -4,4 +4,4 @@ requests # if we bump the gnupg version, bump also the sanity check # in keymanager.__init__ gnupg>=1.4.0 -enum +enum34 diff --git a/src/leap/keymanager/keys.py b/src/leap/keymanager/keys.py index 4e98de6c..562c0a9b 100644 --- a/src/leap/keymanager/keys.py +++ b/src/leap/keymanager/keys.py @@ -213,7 +213,7 @@ class EncryptionKey(object): KEY_EXPIRY_DATE_KEY: expiry_date, KEY_LAST_AUDITED_AT_KEY: last_audited_at, KEY_REFRESHED_AT_KEY: refreshed_at, - KEY_VALIDATION_KEY: str(self.validation), + KEY_VALIDATION_KEY: self.validation.name, KEY_ENCR_USED_KEY: self.encr_used, KEY_SIGN_USED_KEY: self.sign_used, KEY_TAGS_KEY: [KEYMANAGER_KEY_TAG], diff --git a/src/leap/keymanager/tests/test_keymanager.py b/src/leap/keymanager/tests/test_keymanager.py index 86832bab..93bc42c7 100644 --- a/src/leap/keymanager/tests/test_keymanager.py +++ b/src/leap/keymanager/tests/test_keymanager.py @@ -79,7 +79,7 @@ class KeyManagerUtilTestCase(unittest.TestCase): 'expiry_date': 0, 'last_audited_at': 0, 'refreshed_at': 1311239602, - 'validation': str(ValidationLevel.Weak_Chain), + 'validation': ValidationLevel.Weak_Chain.name, 'encr_used': False, 'sign_used': True, } diff --git a/src/leap/keymanager/validation.py b/src/leap/keymanager/validation.py index c6fe478b..c81d533a 100644 --- a/src/leap/keymanager/validation.py +++ b/src/leap/keymanager/validation.py @@ -24,17 +24,17 @@ See: from datetime import datetime -from enum import Enum +from enum import IntEnum -ValidationLevel = Enum( - "Weak_Chain", - "Provider_Trust", - "Provider_Endorsement", - "Third_Party_Endorsement", - "Third_Party_Consensus", - "Historically_Auditing", - "Known_Key", +ValidationLevel = IntEnum("ValidationLevel", + "Weak_Chain " + "Provider_Trust " + "Provider_Endorsement " + "Third_Party_Endorsement " + "Third_Party_Consensus " + "Historically_Auditing " + "Known_Key " "Fingerprint") @@ -49,7 +49,7 @@ def toValidationLevel(value): :raises ValueError: if C{value} is not a validation level """ for level in ValidationLevel: - if value == str(level): + if value == level.name: return level raise ValueError("Not valid validation level: %s" % (value,)) |