separate get_imported_module

This commit is contained in:
debugtalk
2017-08-31 11:06:11 +08:00
parent 74c97a9ccb
commit ad58e2915f
2 changed files with 11 additions and 7 deletions
+3 -3
View File
@@ -1,5 +1,4 @@
import copy import copy
import importlib
import os import os
import re import re
import sys import sys
@@ -46,7 +45,7 @@ class Context(object):
""" import required modules dynamicly """ import required modules dynamicly
""" """
for module_name in modules: 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"): def bind_functions(self, function_binds, level="testcase"):
""" Bind named functions within the context """ Bind named functions within the context
@@ -70,7 +69,8 @@ class Context(object):
""" """
sys.path.insert(0, os.getcwd()) sys.path.insert(0, os.getcwd())
for module_name in modules: 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) self.__update_context_functions_config(level, imported_functions_dict)
def bind_variables(self, variable_binds, level="testcase"): def bind_variables(self, variable_binds, level="testcase"):
+8 -4
View File
@@ -255,9 +255,13 @@ def is_function(tup):
name, item = tup name, item = tup
return isinstance(item, types.FunctionType) return isinstance(item, types.FunctionType)
def get_module_functions(module_name): def get_imported_module(module_name):
""" import module and return filtered functions """ import module and return imported module
""" """
imported = importlib.import_module(module_name) return importlib.import_module(module_name)
module_functions_dict = dict(filter(is_function, vars(imported).items()))
def filter_module_functions(module):
""" filter functions from import module
"""
module_functions_dict = dict(filter(is_function, vars(module).items()))
return module_functions_dict return module_functions_dict