summaryrefslogtreecommitdiff
path: root/python/ovs/db/data.py
diff options
context:
space:
mode:
Diffstat (limited to 'python/ovs/db/data.py')
-rw-r--r--python/ovs/db/data.py10
1 files changed, 5 insertions, 5 deletions
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