Merge pull request #5903 from stephenchengCloud/private/stephenche/drop_python2_XenAPI

Drop python2 support for XenAPI

Author: liulinC

.github/workflows/release.yml

@@ -33,7 +33,7 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: XenAPI
-          path: scripts/examples/python/dist/
+          path: python3/examples/dist/
 
   build-sdks:
     name: Build and upload SDK artifacts

.gitignore

@@ -16,10 +16,10 @@ config.mk
 # python packaging
 **/__pycache__/
 **/*.pyc
-scripts/examples/python/setup.py
-scripts/examples/python/XenAPI.egg-info/
-scripts/examples/python/build/
-scripts/examples/python/dist/
+python3/examples/setup.py
+python3/examples/XenAPI.egg-info/
+python3/examples/build/
+python3/examples/dist/
 
 # ignore file needed for building the SDK
 ocaml/sdk-gen/csharp/XE_SR_ERRORCODES.xml

Makefile

@@ -121,7 +121,7 @@ sdk:
 	cp -r _build/default/ocaml/sdk-gen/java/autogen/* $(XAPISDK)/java
 	cp -r _build/default/ocaml/sdk-gen/powershell/autogen/* $(XAPISDK)/powershell
 	cp -r _build/default/ocaml/sdk-gen/go/autogen/* $(XAPISDK)/go
-	cp scripts/examples/python/XenAPI/XenAPI.py $(XAPISDK)/python
+	cp python3/examples/XenAPI/XenAPI.py $(XAPISDK)/python
 	sh ocaml/sdk-gen/windows-line-endings.sh $(XAPISDK)/csharp
 	sh ocaml/sdk-gen/windows-line-endings.sh $(XAPISDK)/powershell
 
@@ -136,7 +136,7 @@ sdk-build-java: sdk
 	cd _build/install/default/xapi/sdk/java && mvn -f xen-api/pom.xml -B clean package install -Drevision=0.0
 
 python:
-	$(MAKE) -C scripts/examples/python build
+	$(MAKE) -C python3/examples build
 
 doc-json:
 	dune exec --profile=$(PROFILE) -- ocaml/idl/json_backend/gen_json.exe -destdir $(XAPIDOC)/jekyll

ocaml/sdk-gen/README.md

@@ -9,7 +9,7 @@ XenAPI's datamodel. The generation code is written in OCaml and is contained in
 this directory.
 
 The Python module is not auto-generated, it can be found at
-[XenAPI.py](../../scripts/examples/python/XenAPI/XenAPI.py).
+[XenAPI.py](../../python3/examples/XenAPI/XenAPI.py).
 
 To compile the generated source code, follow the instructions in the corresponding
 `README` files.

pyproject.toml

@@ -227,6 +227,9 @@ exclude              = [
     "ocaml/xcp-rrdd/scripts/rrdd/rrdd.py",
     "ocaml/xcp-rrdd/scripts/rrdd/rrdd-example.py",
     "python3/packages/observer.py",
+    "python3/examples/XenAPI/XenAPI.py",
+    "python3/examples/XenAPIPlugin.py",
+
 ]
 
 

python3/Makefile

@@ -52,6 +52,10 @@ install:
 	$(IDATA) perfmon/perfmon.service $(DESTDIR)/usr/lib/systemd/system/perfmon.service
 	$(IPROG) perfmon/sysconfig-perfmon $(DESTDIR)/etc/sysconfig/perfmon
 
+# example/python
+	$(IDATA) examples/XenAPIPlugin.py $(DESTDIR)$(SITE3_DIR)/
+	$(IDATA) examples/XenAPI/XenAPI.py $(DESTDIR)$(SITE3_DIR)/
+
 
 # poweron
 	$(IPROG) poweron/wlan.py $(DESTDIR)$(PLUGINDIR)/wlan.py

scripts/examples/python/Makefile renamed to python3/examples/Makefile

@@ -8,5 +8,4 @@ build:
 	SETUPTOOLS_SCM_PRETEND_VERSION=$(XAPI_VERSION) python -m build --sdist .
 
 clean:
-	dune clean
 	rm -rf dist/ build/ XenAPI.egg-info/

scripts/examples/python/README.md renamed to python3/examples/README.md

@@ -7,7 +7,7 @@ To install the package, enable the virtual environment where it's going to be us
 Examples
 --------
 
-The [examples](https://github.com/xapi-project/xen-api/tree/master/scripts/examples/python) will not work unless they have been placed in the same directory as `XenAPI.py` or `XenAPI` package from PyPI has been installed (`pip install XenAPI`)
+The [examples](https://github.com/xapi-project/xen-api/tree/master/python3/examples) will not work unless they have been placed in the same directory as `XenAPI.py` or `XenAPI` package from PyPI has been installed (`pip install XenAPI`)
 
 Packaging
 =========

scripts/examples/python/XenAPI/XenAPI.py renamed to python3/examples/XenAPI/XenAPI.py

@@ -58,13 +58,8 @@
 import os
 import socket
 import sys
-
-if sys.version_info[0] == 2:
-    import httplib as httplib
-    import xmlrpclib as xmlrpclib
-else:
-    import http.client as httplib
-    import xmlrpc.client as xmlrpclib
+import http.client as httplib
+import xmlrpc.client as xmlrpclib
 
 otel = False
 try:
@@ -150,15 +145,10 @@ class Session(xmlrpclib.ServerProxy):
     def __init__(self, uri, transport=None, encoding=None, verbose=False,
                  allow_none=True, ignore_ssl=False):
 
-        if sys.version_info[0] > 2:
-            # this changed to be a 'bool' in Python3
-            verbose = bool(verbose)
-            allow_none = bool(allow_none)
+        verbose = bool(verbose)
+        allow_none = bool(allow_none)
 
-        # Fix for CA-172901 (+ Python 2.4 compatibility)
-        # Fix for context=ctx ( < Python 2.7.9 compatibility)
-        if not (sys.version_info[0] <= 2 and sys.version_info[1] <= 7 and sys.version_info[2] <= 9 ) \
-                and ignore_ssl:
+        if ignore_ssl:
             import ssl
             ctx = ssl._create_unverified_context()
             xmlrpclib.ServerProxy.__init__(self, uri, transport, encoding,