Merge pull request #300 from mkow/mkow/fix-imp

Replace `imp` module (removed in Python 3.12; to fix compatibility with IDA 8.4)

codecut/cc_main.py

@@ -22,7 +22,7 @@
 import cc_base
 import basicutils_7x as basicutils
 import snap_cg
-import imp
+import importlib
 
 try:
   import modnaming
@@ -57,12 +57,12 @@ def go():
 	return True
 
 if __name__ == "__main__":
-	imp.reload(modnaming)
-	imp.reload(module)
-	imp.reload(cc_base)
-	imp.reload(lfa)
-	imp.reload(maxcut)
-	imp.reload(snap_cg)
-	imp.reload(basicutils)
+	importlib.reload(modnaming)
+	importlib.reload(module)
+	importlib.reload(cc_base)
+	importlib.reload(lfa)
+	importlib.reload(maxcut)
+	importlib.reload(snap_cg)
+	importlib.reload(basicutils)
 	go()
 

diaphora.py

@@ -21,7 +21,6 @@
 import os
 import re
 import sys
-import imp
 import time
 import json
 import decimal
@@ -120,6 +119,16 @@
 fmt = "[Diaphora: %(asctime)s] %(levelname)s: %(message)s"
 logging.basicConfig(format=fmt, level=logging.INFO)
 
+#-------------------------------------------------------------------------------
+def load_source(modname, filename):
+  # Copied from https://docs.python.org/3.12/whatsnew/3.12.html#imp as a
+  # replacement for the removed imp.load_source().
+  loader = importlib.machinery.SourceFileLoader(modname, filename)
+  spec = importlib.util.spec_from_file_location(modname, filename, loader=loader)
+  module = importlib.util.module_from_spec(spec)
+  # The module is always executed and not cached in sys.modules.
+  loader.exec_module(module)
+  return module
 
 #-------------------------------------------------------------------------------
 def result_iter(cursor, arraysize=1000):
@@ -498,7 +507,7 @@ def load_hooks(self):
 
     try:
       log(f"Loading project specific Python script {self.project_script}")
-      module = imp.load_source("diaphora_hooks", self.project_script)
+      module = load_source("diaphora_hooks", self.project_script)
     except:
       err = str(sys.exc_info()[1])
       print(f"Error loading project specific Python script: {err}")