py3: make sure we are not using unicode type in python3

This uses the same mechanism as ac683ca.

Signed-off-by: Yann Dirson <[email protected]>

ocaml/xapi-storage/python/xapi/storage/api/datapath.py

@@ -6,6 +6,14 @@
 import argparse
 import traceback
 import logging
+
+# pylint: disable=invalid-name,redefined-builtin,undefined-variable
+# pyright: reportUndefinedVariable=false
+if sys.version_info[0] > 2:
+    long = int
+    unicode = str
+    str = bytes
+
 class Unimplemented(Rpc_light_failure):
     def __init__(self, arg_0):
         Rpc_light_failure.__init__(self, "Unimplemented", [ arg_0 ])
@@ -398,4 +406,4 @@ def _dispatch(self, method, params):
 class datapath_server_test(datapath_server_dispatcher):
     """Create a server which will respond to all calls, returning arbitrary values. This is intended as a marshal/unmarshal test."""
     def __init__(self):
-        datapath_server_dispatcher.__init__(self, Datapath_server_dispatcher(Datapath_test()))
+        datapath_server_dispatcher.__init__(self, Datapath_server_dispatcher(Datapath_test()))

ocaml/xapi-storage/python/xapi/storage/api/plugin.py

@@ -6,6 +6,14 @@
 import argparse
 import traceback
 import logging
+
+# pylint: disable=invalid-name,redefined-builtin,undefined-variable
+# pyright: reportUndefinedVariable=false
+if sys.version_info[0] > 2:
+    long = int
+    unicode = str
+    str = bytes
+
 class Unimplemented(Rpc_light_failure):
     def __init__(self, arg_0):
         Rpc_light_failure.__init__(self, "Unimplemented", [ arg_0 ])
@@ -230,4 +238,4 @@ def _dispatch(self, method, params):
 class plugin_server_test(plugin_server_dispatcher):
     """Create a server which will respond to all calls, returning arbitrary values. This is intended as a marshal/unmarshal test."""
     def __init__(self):
-        plugin_server_dispatcher.__init__(self, Plugin_server_dispatcher(Plugin_test()))
+        plugin_server_dispatcher.__init__(self, Plugin_server_dispatcher(Plugin_test()))