python: Accept multiple forms of strings and lists when parsing JSON.

[openvswitch] / python / ovs / db / parser.py

diff --git a/python/ovs/db/parser.py b/python/ovs/db/parser.py
index 173922bab051add7e5e9275fa60ba2f7e0b0521a..7f0a6f0629eb337c65fffb47d6f5ddb7329cb9bf 100644 (file)
--- a/python/ovs/db/parser.py
+++ b/python/ovs/db/parser.py
@@ -89,11 +89,10 @@ def json_type_to_string(type_):
     else:
         return "<invalid>"
 
-def unwrap_json(json, name, need_type):
-    if (type(json) != list or len(json) != 2 or json[0] != name or
-        type(json[1]) != need_type):
-        raise error.Error('expected ["%s", <%s>]'
-                          % (name, json_type_to_string(need_type)), json)
+def unwrap_json(json, name, types, desc):
+    if (type(json) not in (list, tuple) or len(json) != 2 or json[0] != name or
+        type(json[1]) not in types):
+        raise error.Error('expected ["%s", <%s>]' % (name, desc), json)
     return json[1]
 
 def parse_json_pair(json):