From f09aa106ee66e387d68c339cdcd7426a01c4bf8d Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Tue, 23 Aug 2011 09:58:49 -0700 Subject: [PATCH] ovs.db.types: Simplify code to avoid try/except case. Also fixes a typo that caused one version of the error message to have a hyphen and the other to have a space. Suggested-by: Reid Price --- python/ovs/db/types.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/python/ovs/db/types.py b/python/ovs/db/types.py index f7bc2482..416d7456 100644 --- a/python/ovs/db/types.py +++ b/python/ovs/db/types.py @@ -30,16 +30,14 @@ class AtomicType(object): for atomic_type in ATOMIC_TYPES: if s == atomic_type.name: return atomic_type - raise error.Error('"%s" is not an atomic type' % s) + raise error.Error('"%s" is not an atomic-type' % s, s) @staticmethod def from_json(json): if type(json) not in [str, unicode]: raise error.Error("atomic-type expected", json) - try: + else: return AtomicType.from_string(json) - except error.Error: - raise error.Error('"%s" is not an atomic-type' % json, json) def __str__(self): return self.name -- 2.30.2