summaryrefslogtreecommitdiff
path: root/lib/ansible/plugins/action/copy.py
diff options
context:
space:
mode:
Diffstat (limited to 'lib/ansible/plugins/action/copy.py')
-rw-r--r--lib/ansible/plugins/action/copy.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ansible/plugins/action/copy.py b/lib/ansible/plugins/action/copy.py
index cb3d15b3..048f98dd 100644
--- a/lib/ansible/plugins/action/copy.py
+++ b/lib/ansible/plugins/action/copy.py
@@ -30,7 +30,7 @@ import traceback
from ansible import constants as C
from ansible.errors import AnsibleError, AnsibleFileNotFound
from ansible.module_utils.basic import FILE_COMMON_ARGUMENTS
-from ansible.module_utils._text import to_bytes, to_native, to_text
+from ansible.module_utils.common.text.converters import to_bytes, to_native, to_text
from ansible.module_utils.parsing.convert_bool import boolean
from ansible.plugins.action import ActionBase
from ansible.utils.hashing import checksum
@@ -286,7 +286,7 @@ class ActionModule(ActionBase):
# The checksums don't match and we will change or error out.
if self._play_context.diff and not raw:
- result['diff'].append(self._get_diff_data(dest_file, source_full, task_vars))
+ result['diff'].append(self._get_diff_data(dest_file, source_full, task_vars, content))
if self._play_context.check_mode:
self._remove_tempfile_if_content_defined(content, content_tempfile)