Merge pull request #175 from xenserver-next/Python3-Fix-InternalError…

…-Creation src/lib/pythongen.ml: Fix InternalError(str(exception)) for Py3
mirage · Jun 27, 2023 · cbcdec7 · cbcdec7
2 parents 13ff10a + e7054a8
commit cbcdec7
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/lib/pythongen.ml b/src/lib/pythongen.ml
@@ -97,7 +97,8 @@ class ListAction(argparse.Action):
 
 
 let compat_block =
-  [ Line "if sys.version_info[0] > 2:"
+  [ Line "get_str = str"
+  ; Line "if sys.version_info[0] > 2:"
   ; Block [ Line "long = int"; Line "unicode = str"; Line "str = bytes" ]
   ; Line ""
   ]
@@ -847,7 +848,7 @@ let of_interfaces ?(helpers = inline_defaults) i =
             ; Block
                 [ Line {|logging.log("caught %s", exn)|}
                 ; Line "traceback.print_exc()"
-                ; Line "return InternalError(str(exn)).failure()"
+                ; Line "return InternalError(get_str(exn)).failure()"
                 ]
             ]
         ]