issue #324: fix Python 3 fallout for custom module_utils.
Also enable at last one of its tests.
This commit is contained in:
parent
f4a66194e4
commit
3e0de9790c
|
@ -264,9 +264,9 @@ class ModuleUtilsImporter(object):
|
|||
mod.__loader__ = self
|
||||
if is_pkg:
|
||||
mod.__path__ = []
|
||||
mod.__package__ = fullname
|
||||
mod.__package__ = str(fullname)
|
||||
else:
|
||||
mod.__package__ = fullname.rpartition('.')[0]
|
||||
mod.__package__ = str(fullname.rpartition('.')[0])
|
||||
exec(code, mod.__dict__)
|
||||
self._loaded.add(fullname)
|
||||
return mod
|
||||
|
|
|
@ -7,7 +7,7 @@ callback_plugins = lib/callback
|
|||
stdout_callback = nice_stdout
|
||||
vars_plugins = lib/vars
|
||||
library = lib/modules
|
||||
# module_utils = lib/module_utils
|
||||
module_utils = lib/module_utils
|
||||
retry_files_enabled = False
|
||||
forks = 50
|
||||
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
- import_playbook: connection_loader/all.yml
|
||||
- import_playbook: context_service/all.yml
|
||||
- import_playbook: local/all.yml
|
||||
#- import_playbook: module_utils/all.yml
|
||||
- import_playbook: module_utils/all.yml
|
||||
- import_playbook: playbook_semantics/all.yml
|
||||
- import_playbook: remote_tmp/all.yml
|
||||
- import_playbook: runner/all.yml
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
|
||||
- import_playbook: from_config_path.yml
|
||||
- import_playbook: from_config_path_pkg.yml
|
||||
- import_playbook: adjacent_to_playbook.yml
|
||||
#- import_playbook: from_config_path.yml
|
||||
#- import_playbook: from_config_path_pkg.yml
|
||||
#- import_playbook: adjacent_to_playbook.yml
|
||||
- import_playbook: adjacent_to_role.yml
|
||||
- import_playbook: overrides_builtin.yml
|
||||
#- import_playbook: overrides_builtin.yml
|
||||
|
|
Loading…
Reference in New Issue