diff --git a/ate/context.py b/ate/context.py index 03b692da..5dacd3d4 100644 --- a/ate/context.py +++ b/ate/context.py @@ -1,5 +1,4 @@ import copy -import importlib import os import re import sys @@ -46,7 +45,7 @@ class Context(object): """ import required modules dynamicly """ for module_name in modules: - globals()[module_name] = importlib.import_module(module_name) + globals()[module_name] = utils.get_imported_module(module_name) def bind_functions(self, function_binds, level="testcase"): """ Bind named functions within the context @@ -70,7 +69,8 @@ class Context(object): """ sys.path.insert(0, os.getcwd()) for module_name in modules: - imported_functions_dict = utils.get_module_functions(module_name) + imported_module = utils.get_imported_module(module_name) + imported_functions_dict = utils.filter_module_functions(imported_module) self.__update_context_functions_config(level, imported_functions_dict) def bind_variables(self, variable_binds, level="testcase"): diff --git a/ate/utils.py b/ate/utils.py index 4f4694d3..b795984e 100644 --- a/ate/utils.py +++ b/ate/utils.py @@ -255,9 +255,13 @@ def is_function(tup): name, item = tup return isinstance(item, types.FunctionType) -def get_module_functions(module_name): - """ import module and return filtered functions +def get_imported_module(module_name): + """ import module and return imported module """ - imported = importlib.import_module(module_name) - module_functions_dict = dict(filter(is_function, vars(imported).items())) + return importlib.import_module(module_name) + +def filter_module_functions(module): + """ filter functions from import module + """ + module_functions_dict = dict(filter(is_function, vars(module).items())) return module_functions_dict