From 53a640f2cc1911306b9c701eda05f04330d76d98 Mon Sep 17 00:00:00 2001 From: Matt Clay Date: Wed, 16 Jan 2019 11:07:13 -0800 Subject: [PATCH] Use to_bytes on open and to_native on load_source. --- lib/ansible/plugins/loader.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/ansible/plugins/loader.py b/lib/ansible/plugins/loader.py index 86dee7652a0..f9a20748a05 100644 --- a/lib/ansible/plugins/loader.py +++ b/lib/ansible/plugins/loader.py @@ -18,7 +18,7 @@ from collections import defaultdict from ansible import constants as C from ansible.errors import AnsibleError -from ansible.module_utils._text import to_bytes, to_text +from ansible.module_utils._text import to_bytes, to_native, to_text from ansible.parsing.utils.yaml import from_yaml from ansible.plugins import get_plugin_class, MODULE_CACHE, PATH_CACHE, PLUGIN_PATH_CACHE from ansible.utils.display import Display @@ -350,8 +350,8 @@ class PluginLoader: with warnings.catch_warnings(): warnings.simplefilter("ignore", RuntimeWarning) - with open(path, 'rb') as module_file: - module = imp.load_source(full_name, to_bytes(path), module_file) + with open(to_bytes(path), 'rb') as module_file: + module = imp.load_source(full_name, to_native(path), module_file) return module def _update_object(self, obj, name, path):