Removing deprecated module 'imp' in favour of 'importlib'

PandABlocks · Nov 20, 2024 · c28edf0 · c28edf0
1 parent 4e7cd9a
commit c28edf0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/common/python/simulations.py b/common/python/simulations.py
@@ -4,7 +4,7 @@
 import struct
 import time
 import bisect
-import imp
+import importlib
 import os
 import sys
 from collections import namedtuple, deque
@@ -261,9 +261,9 @@ def create_block(self, ini_path, number, block_address):
         ini_path = os.path.join(ROOT, ini_path)
         module_path = os.path.dirname(ini_path)
         try:
-            f, pathname, description = imp.find_module(
+            f, pathname, description = importlib.import_module(
                 block_name + "_sim", [module_path])
-            package = imp.load_module(
+            package = importlib.exec_module(
                 block_name + "_sim", f, pathname, description)
             clsnames = [n for n in dir(package)
                         if n.lower() == block_name + "simulation"]

diff --git a/tests/test_python_sim_timing.py b/tests/test_python_sim_timing.py
@@ -9,7 +9,7 @@
 
 import sys
 import os
-import imp
+import importlib
 import numpy
 
 import unittest
@@ -46,9 +46,9 @@ def __init__(self, module_path, timing_ini, timing_section):
 
         def runTest(self):
             # Load <block>_sim.py into common.python.<block>_sim
-            file, pathname, description = imp.find_module(
+            file, pathname, description = importlib.import_module(
                 self.block_name + "_sim", [self.module_path])
-            mod = imp.load_module(
+            mod = importlib.exec_module(
                 "common.python." + self.block_name,
                 file, pathname, description)
             # Make instance of <Block>Simulation