diff options
author | Loris Zinsou <lzinsou@protonmail.com> | 2019-11-01 17:28:15 +0100 |
---|---|---|
committer | cclauss <cclauss@me.com> | 2019-11-03 17:56:00 +0100 |
commit | bdee976d541696122eaa5e9b877c0d52e26df010 (patch) | |
tree | 6125d090f25848faab61c1607429073afcb8c2b5 /tools | |
parent | 93ab623c5589d810c850c70c4be05a6ed3adfaaf (diff) | |
download | android-node-v8-bdee976d541696122eaa5e9b877c0d52e26df010.tar.gz android-node-v8-bdee976d541696122eaa5e9b877c0d52e26df010.tar.bz2 android-node-v8-bdee976d541696122eaa5e9b877c0d52e26df010.zip |
tools: fix Python 3 deprecation warning in test.py
PR-URL: https://github.com/nodejs/node/pull/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>
Diffstat (limited to 'tools')
-rwxr-xr-x | tools/test.py | 41 |
1 files changed, 28 insertions, 13 deletions
diff --git a/tools/test.py b/tools/test.py index 04babded24..b928662dec 100755 --- 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 multiprocessing 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 @@ -791,18 +811,13 @@ class TestRepository(TestSuite): 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): |