From: Ben Pfaff <blp@nicira.com>
Date: Tue, 23 Aug 2011 16:36:56 +0000 (-0700)
Subject: ovs.db.parser: Simplify code.
X-Git-Tag: v1.3.0~407
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=c29e06be0e224f1c2392e892016bd6b80749611d;p=sliver-openvswitch.git

ovs.db.parser: Simplify code.

Suggested-by: Reid Price <reid@nicira.com>
---

diff --git a/python/ovs/db/parser.py b/python/ovs/db/parser.py
index 67b3bd53c..173922bab 100644
--- a/python/ovs/db/parser.py
+++ b/python/ovs/db/parser.py
@@ -53,15 +53,13 @@ class Parser(object):
         if missing:
             name = missing.pop()
             if len(missing) > 1:
-                self.__raise_error("Member '%s' and %d other members "
-                                   "are present but not allowed here"
-                                   % (name, len(missing)))
+                present = "and %d other members are" % len(missing)
             elif missing:
-                self.__raise_error("Member '%s' and 1 other member "
-                                   "are present but not allowed here" % name)
+                present = "and 1 other member are"
             else:
-                self.__raise_error("Member '%s' is present but not "
-                                   "allowed here" % name)
+                present = "is"
+            self.__raise_error("Member '%s' %s present but not allowed here" %
+                               (name, present))
     
 def float_to_int(x):
     # XXX still needed?