Merge pull request #5431 from psafont/poor-man-compat-rev

xapi-project · Feb 6, 2024 · 2ee9b21 · 2ee9b21
2 parents 004590e + 7051580
commit 2ee9b21
Show file tree

Hide file tree

Showing 10 changed files with 26 additions and 47 deletions.
diff --git a/Makefile b/Makefile
@@ -62,7 +62,9 @@ test:
 	 trap "kill $${PSTREE_SLEEP_PID}" SIGINT SIGTERM EXIT; \
 	 timeout --foreground $(TEST_TIMEOUT2) \
 		 dune runtest --profile=$(PROFILE) --error-reporting=twice -j $(JOBS)
+ifneq ($(PY_TEST), NO)
 	dune build @runtest-python --profile=$(PROFILE)
+endif
 
 stresstest:
 	dune build @stresstest --profile=$(PROFILE) --no-buffer -j $(JOBS)

diff --git a/ocaml/xapi-storage-script/test/volume/org.xen.xapi.storage.dummy/plugin.py b/ocaml/xapi-storage-script/test/volume/org.xen.xapi.storage.dummy/plugin.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python2
 
 """
  Copyright (C) Citrix Systems, Inc.

diff --git a/ocaml/xapi-storage-script/test/volume/org.xen.xapi.storage.dummy/sr.py b/ocaml/xapi-storage-script/test/volume/org.xen.xapi.storage.dummy/sr.py
@@ -1,12 +1,12 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python2
 
 """
  Copyright (C) Citrix Systems, Inc.
 """
 
 import os
 import sys
-import urllib.parse
+import urlparse
 import xapi.storage.api.volume
 
 import plugin
@@ -21,11 +21,11 @@ def create(self, dbg, uri, name, description, configuration):
         return
 
     def detach(self, dbg, sr):
-        urllib.parse.urlparse(sr)
+        urlparse.urlparse(sr)
         return
 
     def ls(self, dbg, sr):
-        urllib.parse.urlparse(sr)
+        urlparse.urlparse(sr)
         qr = plugin.Implementation().query(dbg)
         return [{
             "name": qr['name'],
@@ -40,7 +40,7 @@ def ls(self, dbg, sr):
             }]
 
     def stat(self, dbg, sr):
-        urllib.parse.urlparse(sr)
+        urlparse.urlparse(sr)
         qr = plugin.Implementation().query(dbg)
         return {
             "sr": sr,

diff --git a/ocaml/xapi-storage-script/test/volume/org.xen.xapi.storage.dummy/volume.py b/ocaml/xapi-storage-script/test/volume/org.xen.xapi.storage.dummy/volume.py
@@ -1,11 +1,11 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python2
 
 """
  Copyright (C) Citrix Systems, Inc.
 """
 
 import uuid
-import urllib.parse
+import urlparse
 import os
 import sys
 import xapi.storage.api.volume
@@ -17,7 +17,7 @@
 class Implementation(xapi.storage.api.volume.Volume_skeleton):
 
     def create(self, dbg, sr, name, description, size):
-        urllib.parse.urlparse(sr)
+        urlparse.urlparse(sr)
         voluuid = str(uuid.uuid4())
         return {
             "name": name,
@@ -32,11 +32,11 @@ def create(self, dbg, sr, name, description, size):
         }
 
     def destroy(self, dbg, sr, key):
-        urllib.parse.urlparse(sr)
+        urlparse.urlparse(sr)
         return
 
     def stat(self, dbg, sr, key):
-        urllib.parse.urlparse(sr)
+        urlparse.urlparse(sr)
         qr = plugin.Implementation().query(dbg)
         return {
                 "name": qr['name'],

diff --git a/ocaml/xapi-storage-script/test/volume/org.xen.xapi.storage.dummyv5/plugin.py b/ocaml/xapi-storage-script/test/volume/org.xen.xapi.storage.dummyv5/plugin.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python2
 
 """
  Copyright (C) Citrix Systems, Inc.

diff --git a/ocaml/xapi-storage-script/test/volume/org.xen.xapi.storage.dummyv5/sr.py b/ocaml/xapi-storage-script/test/volume/org.xen.xapi.storage.dummyv5/sr.py
@@ -1,12 +1,12 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python2
 
 """
  Copyright (C) Citrix Systems, Inc.
 """
 
 import os
 import sys
-import urllib.parse
+import urlparse
 import xapi.storage.api.v5.volume
 
 import plugin
@@ -22,11 +22,11 @@ def create(self, dbg, uuid, configuration, name, description):
         return configuration
 
     def detach(self, dbg, sr):
-        urllib.parse.urlparse(sr)
+        urlparse.urlparse(sr)
         return
 
     def ls(self, dbg, sr):
-        urllib.parse.urlparse(sr)
+        urlparse.urlparse(sr)
         qr = plugin.Implementation().query(dbg)
         return [{
             "name": qr['name'],
@@ -42,7 +42,7 @@ def ls(self, dbg, sr):
             }]
 
     def stat(self, dbg, sr):
-        urllib.parse.urlparse(sr)
+        urlparse.urlparse(sr)
         qr = plugin.Implementation().query(dbg)
         return {
             "sr": sr,

diff --git a/ocaml/xapi-storage-script/test/volume/org.xen.xapi.storage.dummyv5/volume.py b/ocaml/xapi-storage-script/test/volume/org.xen.xapi.storage.dummyv5/volume.py
@@ -1,11 +1,11 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python2
 
 """
  Copyright (C) Citrix Systems, Inc.
 """
 
 import uuid
-import urllib.parse
+import urlparse
 import os
 import sys
 import xapi.storage.api.v5.volume
@@ -17,7 +17,7 @@
 class Implementation(xapi.storage.api.v5.volume.Volume_skeleton):
 
     def create(self, dbg, sr, name, description, size, sharable):
-        urllib.parse.urlparse(sr)
+        urlparse.urlparse(sr)
         voluuid = str(uuid.uuid4())
         return {
             "name": name,
@@ -33,11 +33,11 @@ def create(self, dbg, sr, name, description, size, sharable):
         }
 
     def destroy(self, dbg, sr, key):
-        urllib.parse.urlparse(sr)
+        urlparse.urlparse(sr)
         return
 
     def stat(self, dbg, sr, key):
-        urllib.parse.urlparse(sr)
+        urlparse.urlparse(sr)
         qr = plugin.Implementation().query(dbg)
         return {
                 "name": qr['name'],

diff --git a/ocaml/xapi-storage/python/xapi/__init__.py b/ocaml/xapi-storage/python/xapi/__init__.py
@@ -31,13 +31,6 @@
 import json
 import argparse
 
-# pylint: disable=invalid-name,redefined-builtin,undefined-variable
-# pyright: reportUndefinedVariable=false
-if sys.version_info[0] > 2:
-    long = int
-    unicode = str
-    str = bytes
-
 
 def success(result):
     return {"Status": "Success", "Value": result}

diff --git a/ocaml/xapi-storage/python/xapi/storage/api/datapath.py b/ocaml/xapi-storage/python/xapi/storage/api/datapath.py
@@ -6,14 +6,6 @@
 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 ])
@@ -406,4 +398,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()))
diff --git a/ocaml/xapi-storage/python/xapi/storage/api/plugin.py b/ocaml/xapi-storage/python/xapi/storage/api/plugin.py
@@ -6,14 +6,6 @@
 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 ])
@@ -238,4 +230,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()))