From a53ee8c038ce6338f73973f27d1ea0bea9ae9437 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
Date: Tue, 5 Dec 2023 16:00:40 +0100
Subject: [PATCH] Replace deprecated imp module with importlib

---
 Uranium-5.6.0-importlib.patch | 59 +++++++++++++++++++++++++++++++++++
 python-uranium.spec           |  7 ++---
 2 files changed, 61 insertions(+), 5 deletions(-)
 create mode 100644 Uranium-5.6.0-importlib.patch

diff --git a/Uranium-5.6.0-importlib.patch b/Uranium-5.6.0-importlib.patch
new file mode 100644
index 0000000..ec31520
--- /dev/null
+++ b/Uranium-5.6.0-importlib.patch
@@ -0,0 +1,59 @@
+From e86d717035af317dab5d62851181873ec3c38ebe Mon Sep 17 00:00:00 2001
+From: Remco Burema <r.burema@ultimaker.com>
+Date: Fri, 20 Oct 2023 14:40:10 +0200
+Subject: [PATCH] Replace deprecated imp module with importlib.
+
+done as part of Python 3.12 spike (CURA-11078)
+---
+ UM/PluginRegistry.py | 18 +++++++++++-------
+ 1 file changed, 11 insertions(+), 7 deletions(-)
+
+diff --git a/UM/PluginRegistry.py b/UM/PluginRegistry.py
+index 25ef35e56..53dc882b9 100644
+--- a/UM/PluginRegistry.py
++++ b/UM/PluginRegistry.py
+@@ -1,11 +1,13 @@
+-# Copyright (c) 2022 Ultimaker B.V.
++# Copyright (c) 2023 UltiMaker
+ # Uranium is released under the terms of the LGPLv3 or higher.
+ 
+-import imp
++import importlib.util
++import importlib.machinery
+ import json
+ import os
+ import shutil  # For deleting plugin directories;
+ import stat  # For setting file permissions correctly;
++import sys
+ import time
+ import types
+ import zipfile
+@@ -762,7 +764,10 @@ def _findPlugin(self, plugin_id: str) -> Optional[types.ModuleType]:
+             except Exception:
+                 pass
+         try:
+-            file, path, desc = imp.find_module(plugin_id, [final_location])
++            spec = importlib.machinery.PathFinder().find_spec(plugin_id, [final_location])
++            if len(spec.submodule_search_locations) != 1:
++                raise IndexError(f"Attempt to load plugin '{plugin_id}' from {len(spec.submodule_search_locations)} locations.")
++            path = spec.submodule_search_locations[0]
+         except Exception:
+             Logger.logException("e", "Import error when importing %s", plugin_id)
+             return None
+@@ -783,13 +788,12 @@ def _findPlugin(self, plugin_id: str) -> Optional[types.ModuleType]:
+                 return None
+ 
+         try:
+-            module = imp.load_module(plugin_id, file, path, desc)  # type: ignore #MyPy gets the wrong output type from imp.find_module for some reason.
++            module = importlib.util.module_from_spec(spec)
++            sys.modules[plugin_id] = module
++            spec.loader.exec_module(module)
+         except Exception:
+             Logger.logException("e", "Import error loading module %s", plugin_id)
+             return None
+-        finally:
+-            if file:
+-                os.close(file) #type: ignore #MyPy gets the wrong output type from imp.find_module for some reason.
+         self._found_plugins[plugin_id] = module
+         return module
+ 
diff --git a/python-uranium.spec b/python-uranium.spec
index c91fe95..9d7aee2 100644
--- a/python-uranium.spec
+++ b/python-uranium.spec
@@ -8,6 +8,8 @@ Source:         %{url}/archive/%{version}.tar.gz#/Uranium-%{version}.tar.gz
 Patch:          Uranium-5.3.0-qt-try-ints-then-bytes-for-gl-mask-functions.patch
 # Fix asserts for called once in Python 3.12:
 Patch:          https://github.com/Ultimaker/Uranium/pull/885.patch#/Uranium-5.3.0-python3.12.patch
+# Replace deprecated imp module with importlib
+Patch:          https://github.com/Ultimaker/Uranium/pull/915.patch#/Uranium-5.6.0-importlib.patch
 
 # Cmake bits taken from 4.13.1, before upstream went nuts with conan
 Source2:        mod_bundled_packages_json.py
@@ -25,10 +27,6 @@ BuildRequires:  /usr/bin/msgmerge
 BuildRequires:  cmake
 BuildRequires:  git-core
 
-# UM/PluginRegistry.py imports from imp
-# https://github.com/Ultimaker/Uranium/issues/765
-BuildRequires:  (python3-zombie-imp if python3 >= 3.12)
-
 # Tests
 BuildRequires:  python3-arcus >= 5.3.0
 BuildRequires:  python3-cryptography
@@ -60,7 +58,6 @@ Requires:       python3-scipy
 Requires:       python3-shapely
 Requires:       python3-pyclipper
 Requires:       python3-pyqt6
-Requires:       (python3-zombie-imp if python3 >= 3.12)
 Recommends:     python3-numpy-stl
 
 %description -n python3-uranium