From 3760cc3a7d30e58d3ee85f145a8cb6263b54500f Mon Sep 17 00:00:00 2001 From: Toshio Kuratomi Date: Thu, 17 May 2018 12:32:45 -0700 Subject: [PATCH] Fix python-2.4ism that was still present in basic.py's use of tempfile --- lib/ansible/module_utils/basic.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/lib/ansible/module_utils/basic.py b/lib/ansible/module_utils/basic.py index 10c8f2a0fe3..0043b676523 100644 --- a/lib/ansible/module_utils/basic.py +++ b/lib/ansible/module_utils/basic.py @@ -2532,17 +2532,16 @@ class AnsibleModule(object): self.fail_json(msg='Could not replace file: %s to %s: %s' % (src, dest, to_native(e)), exception=traceback.format_exc()) else: - b_dest_dir = os.path.dirname(b_dest) # Use bytes here. In the shippable CI, this fails with # a UnicodeError with surrogateescape'd strings for an unknown # reason (doesn't happen in a local Ubuntu16.04 VM) - native_dest_dir = b_dest_dir - native_suffix = os.path.basename(b_dest) - native_prefix = b('.ansible_tmp') + b_dest_dir = os.path.dirname(b_dest) + b_suffix = os.path.basename(b_dest) error_msg = None tmp_dest_name = None try: - tmp_dest_fd, tmp_dest_name = tempfile.mkstemp(prefix=native_prefix, dir=native_dest_dir, suffix=native_suffix) + tmp_dest_fd, tmp_dest_name = tempfile.mkstemp(prefix=b'.ansible_tmp', + dir=b_dest_dir, suffix=b_suffix) except (OSError, IOError) as e: error_msg = 'The destination directory (%s) is not writable by the current user. Error was: %s' % (os.path.dirname(dest), to_native(e)) except TypeError: