From 6a6f8d167357a1f1751cdd54b9491c531a371ae1 Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Mon, 22 Aug 2011 14:52:21 -0700 Subject: ovsdb-data: Simplify converting an OVSDB datum to JSON by reordering logic. Putting the "map" case first avoids duplicate tests. Suggested-by: Reid Price --- python/ovs/db/data.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'python') diff --git a/python/ovs/db/data.py b/python/ovs/db/data.py index b68d4e32f..9530fb9cd 100644 --- a/python/ovs/db/data.py +++ b/python/ovs/db/data.py @@ -325,14 +325,14 @@ class Datum(object): return Datum(type_, {keyAtom: None}) def to_json(self): - if len(self.values) == 1 and not self.type.is_map(): + if self.type.is_map(): + return ["map", [[k.to_json(), v.to_json()] + for k, v in sorted(self.values.items())]] + elif len(self.values) == 1: key = self.values.keys()[0] return key.to_json() - elif not self.type.is_map(): - return ["set", [k.to_json() for k in sorted(self.values.keys())]] else: - return ["map", [[k.to_json(), v.to_json()] - for k, v in sorted(self.values.items())]] + return ["set", [k.to_json() for k in sorted(self.values.keys())]] def to_string(self): head = tail = None -- cgit v1.2.1