tools: fix Python 3 deprecation warning in test.py

Hellzed · targos · commit 41d1f166bc6c · 2019-11-11T10:24:59.000+01:00
PR-URL: #30208 Reviewed-By: Christian Clauss <cclauss@me.com> Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Michaël Zasso <targos@protonmail.com> Reviewed-By: David Carlier <devnexen@gmail.com>
diff --git a/tools/test.py b/tools/test.py
@@ -29,7 +29,6 @@
 
 
 from __future__ import print_function
-import imp
 import logging
 import optparse
 import os
@@ -45,6 +44,27 @@
 import errno
 import copy
 
+
+if sys.version_info >= (3, 5):
+ from importlib import machinery, util
+ def get_module(name, path):
+ loader_details = (machinery.SourceFileLoader, machinery.SOURCE_SUFFIXES)
+ spec = machinery.FileFinder(path, loader_details).find_spec(name)
+ module = util.module_from_spec(spec)
+ spec.loader.exec_module(module)
+ return module
+else:
+ import imp
+ def get_module(name, path):
+ file = None
+ try:
+ (file, pathname, description) = imp.find_module(name, [path])
+ return imp.load_module(name, file, pathname, description)
+ finally:
+ if file:
+ file.close()
+
+
 from io import open
 from os.path import join, dirname, abspath, basename, isdir, exists
 from datetime import datetime
@@ -786,18 +806,13 @@ def GetConfiguration(self, context):
 if self.is_loaded:
 return self.config
 self.is_loaded = True
- file = None
- try:
- (file, pathname, description) = imp.find_module('testcfg', [ self.path ])
- module = imp.load_module('testcfg', file, pathname, description)
- self.config = module.GetConfiguration(context, self.path)
- if hasattr(self.config, 'additional_flags'):
- self.config.additional_flags += context.node_args
- else:
- self.config.additional_flags = context.node_args
- finally:
- if file:
- file.close()
+
+ module = get_module('testcfg', self.path)
+ self.config = module.GetConfiguration(context, self.path)
+ if hasattr(self.config, 'additional_flags'):
+ self.config.additional_flags += context.node_args
+ else:
+ self.config.additional_flags = context.node_args
 return self.config
 
 def GetBuildRequirements(self, path, context):

-Original file line number
+Diff line change
 from __future__ importprint_function
 -importimp
 importlogging
 importoptparse
 importos
 importerrno
 importcopy
++
 +ifsys.version_info>= (3, 5):
 +fromimportlibimportmachinery, util
 +defget_module(name, path):
 +loader_details= (machinery.SourceFileLoader, machinery.SOURCE_SUFFIXES)
 +spec=machinery.FileFinder(path, loader_details).find_spec(name)
 +module=util.module_from_spec(spec)
 +spec.loader.exec_module(module)
 +returnmodule
 +else:
 +importimp
 +defget_module(name, path):
 +file=None
 +try:
 + (file, pathname, description) =imp.find_module(name, [path])
 +returnimp.load_module(name, file, pathname, description)
 +finally:
 +iffile:
 +file.close()
++
++
 fromioimportopen
 fromos.pathimportjoin, dirname, abspath, basename, isdir, exists
 fromdatetimeimportdatetime
 ifself.is_loaded:
 returnself.config
 self.is_loaded=True
 -file=None
 -try:
 - (file, pathname, description) =imp.find_module('testcfg', [ self.path ])
 -module=imp.load_module('testcfg', file, pathname, description)
 -self.config=module.GetConfiguration(context, self.path)
 -ifhasattr(self.config, 'additional_flags'):
 -self.config.additional_flags+=context.node_args
 -else:
 -self.config.additional_flags=context.node_args
 -finally:
 -iffile:
 -file.close()
++
 +module=get_module('testcfg', self.path)
 +self.config=module.GetConfiguration(context, self.path)
 +ifhasattr(self.config, 'additional_flags'):
 +self.config.additional_flags+=context.node_args
 +else:
 +self.config.additional_flags=context.node_args
 returnself.config
 defGetBuildRequirements(self, path, context):