mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-09-02 07:15:31 +00:00
Code Issues Releases Wiki Activity

zdtm: Replace imp module with importlib

Browse Source 
imp.load_source() has been deprecated [1]. The recommended alternative
API for loading a module is exec_module() [2].

[1] https://docs.python.org/2.7/library/imp.html#imp.load_module
[2] https://docs.python.org/3.4/library/importlib.html#importlib.abc.Loader.exec_module

Signed-off-by: Radostin Stoyanov <rstoyanov1@gmail.com>
This commit is contained in:
Radostin Stoyanov
2019-04-04 02:49:27 +01:00
committed by Andrei Vagin
parent 43095fad2f
commit e65c7b55e9
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
test/zdtm.py
View File

@@ -18,7 +18,6 @@ import sys
import linecache import linecache
import random import random
import string import string
import imp
import fcntl import fcntl
import errno import errno
import datetime import datetime
@@ -575,11 +574,23 @@ class zdtm_test:
subprocess.check_call(["flock", "zdtm_mount_cgroups.lock", "./zdtm_umount_cgroups"]) subprocess.check_call(["flock", "zdtm_mount_cgroups.lock", "./zdtm_umount_cgroups"])
def load_module_from_file(name, path):
if sys.version_info[0] == 3 and sys.version_info[1] >= 5:
import importlib.util
spec = importlib.util.spec_from_file_location(name, path)
mod = importlib.util.module_from_spec(spec)
spec.loader.exec_module(mod)
else:
import imp
mod = imp.load_source(name, path)
return mod
class inhfd_test: class inhfd_test:
def __init__(self, name, desc, flavor, freezer): def __init__(self, name, desc, flavor, freezer):
self.__name = os.path.basename(name) self.__name = os.path.basename(name)
print("Load %s" % name) print("Load %s" % name)
self.__fdtyp = imp.load_source(self.__name, name) self.__fdtyp = load_module_from_file(self.__name, name)
self.__peer_pid = 0 self.__peer_pid = 0
self.__files = None self.__files = None
self.__peer_file_names = [] self.__peer_file_names = []