提交 abcc53de 编写于 作者: C Cleber Rosa

safeloader: rely on the module path

The module path only get's updated on the AvocadoModule constructor,
so after that, it won't change and the `path` variable is thus
unnecessary.
Signed-off-by: NCleber Rosa <crosa@redhat.com>
上级 b3798b28
...@@ -321,8 +321,6 @@ def _examine_class(path, class_name, is_avocado): ...@@ -321,8 +321,6 @@ def _examine_class(path, class_name, is_avocado):
:rtype: tuple :rtype: tuple
""" """
module = AvocadoModule(path) module = AvocadoModule(path)
path = module.path # path might get updated (__init__.py)
ppath = os.path.dirname(path)
info = [] info = []
disabled = [] disabled = []
...@@ -363,7 +361,7 @@ def _examine_class(path, class_name, is_avocado): ...@@ -363,7 +361,7 @@ def _examine_class(path, class_name, is_avocado):
# a module # a module
continue continue
parent_class = parent.id parent_class = parent.id
_info, _disabled, _avocado = _examine_class(path, parent_class, _info, _disabled, _avocado = _examine_class(module.path, parent_class,
is_avocado) is_avocado)
if _info: if _info:
parents.remove(parent) parents.remove(parent)
...@@ -402,7 +400,8 @@ def _examine_class(path, class_name, is_avocado): ...@@ -402,7 +400,8 @@ def _examine_class(path, class_name, is_avocado):
parent_path, parent_module, parent_class = ( parent_path, parent_module, parent_class = (
_parent.rsplit(os.path.sep, 2)) _parent.rsplit(os.path.sep, 2))
modules_paths = [parent_path, ppath] + sys.path modules_paths = [parent_path,
os.path.dirname(module.path)] + sys.path
_, found_ppath, _ = imp.find_module(parent_module, _, found_ppath, _ = imp.find_module(parent_module,
modules_paths) modules_paths)
_info, _dis, _avocado = _examine_class(found_ppath, _info, _dis, _avocado = _examine_class(found_ppath,
...@@ -430,8 +429,6 @@ def find_avocado_tests(path): ...@@ -430,8 +429,6 @@ def find_avocado_tests(path):
:rtype: tuple :rtype: tuple
""" """
module = AvocadoModule(path) module = AvocadoModule(path)
path = module.path # path might get updated (__init__.py)
ppath = os.path.dirname(path)
# The resulting test classes # The resulting test classes
result = collections.OrderedDict() result = collections.OrderedDict()
disabled = set() disabled = set()
...@@ -474,7 +471,7 @@ def find_avocado_tests(path): ...@@ -474,7 +471,7 @@ def find_avocado_tests(path):
# a module # a module
continue continue
parent_class = parent.id parent_class = parent.id
_info, _dis, _avocado = _examine_class(path, parent_class, _info, _dis, _avocado = _examine_class(module.path, parent_class,
is_avocado) is_avocado)
if _info: if _info:
parents.remove(parent) parents.remove(parent)
...@@ -513,7 +510,8 @@ def find_avocado_tests(path): ...@@ -513,7 +510,8 @@ def find_avocado_tests(path):
parent_path, parent_module, parent_class = ( parent_path, parent_module, parent_class = (
_parent.rsplit(os.path.sep, 2)) _parent.rsplit(os.path.sep, 2))
modules_paths = [parent_path, ppath] + sys.path modules_paths = [parent_path,
os.path.dirname(module.path)] + sys.path
_, found_ppath, _ = imp.find_module(parent_module, modules_paths) _, found_ppath, _ = imp.find_module(parent_module, modules_paths)
_info, _dis, _avocado = _examine_class(found_ppath, _info, _dis, _avocado = _examine_class(found_ppath,
parent_class, parent_class,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册