From 75e7d9bece9ddea46a1156279ea6dce9c1ba8cf8 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Wed, 31 Jan 2024 08:39:11 +1100
Subject: [PATCH] Fix add-ons with Python 3.12 by replacing "imp" with
 "importlib"

Also remove unnecessary reloading in object_carver.
---
 io_import_palette/__init__.py |  6 +++---
 object_carver/__init__.py     | 26 ++++++++++++++++----------
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/io_import_palette/__init__.py b/io_import_palette/__init__.py
index 3004a908..06535011 100644
--- a/io_import_palette/__init__.py
+++ b/io_import_palette/__init__.py
@@ -32,10 +32,10 @@ if flag is False:
 # Import modules
 # ----------------------------------------------
 if "bpy" in locals():
-    import imp
+    import importlib
 
-    imp.reload(import_ase)
-    imp.reload(import_krita)
+    importlib.reload(import_ase)
+    importlib.reload(import_krita)
 else:
     import import_ase
     import import_krita
diff --git a/object_carver/__init__.py b/object_carver/__init__.py
index 642be817..c91d1558 100644
--- a/object_carver/__init__.py
+++ b/object_carver/__init__.py
@@ -15,24 +15,30 @@ bl_info = {
     "category": "Object"
     }
 
+if "bpy" in locals():
+    import importlib
+
+    importlib.reload(carver_utils)
+    importlib.reload(carver_profils)
+    importlib.reload(carver_draw)
+    importlib.reload(carver_operator)
+
 import bpy
-import imp
+
 from bpy.props import (
         BoolProperty,
         StringProperty,
         IntProperty
-        )
+)
 from bpy.types import (AddonPreferences, WorkSpaceTool)
 from bpy.utils.toolsystem import ToolDef
 
-from . import carver_utils
-imp.reload(carver_utils)
-from . import carver_profils
-imp.reload(carver_profils)
-from . import carver_draw
-imp.reload(carver_draw)
-from . import carver_operator
-imp.reload(carver_operator)
+from . import (
+    carver_utils,
+    carver_profils,
+    carver_draw,
+    carver_operator,
+)
 
 # TODO : Create an icon for Carver MT
 # Add an icon in the toolbar
-- 
2.11.4.GIT