Merge pull request #58 from robertbreker/fix-json-error-encapsulation

Fix json error encapsulation
xapi-project · Oct 5, 2015 · 30a6b96 · 30a6b96
2 parents 4e0f350 + bc2fce0
commit 30a6b96
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/generator/src/python.ml b/generator/src/python.ml
@@ -298,9 +298,11 @@ let commandline_parse env i m =
         Line (sprintf "\"\"\"%s\"\"\"" m.Method.description);
       ] @ [
         Line "# in --json mode we don't have any other arguments";
-        Line "if '--json' in sys.argv:";
+        Line "if ('--json' in sys.argv or '-j' in sys.argv):";
         Block [
-            Line "return json.loads(sys.stdin.readline(),)";
+            Line "jsondict = json.loads(sys.stdin.readline(),)";
+            Line "jsondict['json'] = True";
+            Line "return jsondict";
         ];
         Line (sprintf "parser = argparse.ArgumentParser(description='%s')" m.Method.description);
         Line "parser.add_argument('-j', '--json', action='store_const', const=True, default=False, help='Read json from stdin, print json to stdout', required=False)";