internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-08 06:12:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Convert the whole files/ directory to py3 syntax (#3685)

Browse Source
This commit is contained in:
Michael Scherer
2016-05-18 16:01:53 +02:00
committed by Matt Clay
parent 0027158b74
commit f7b29ba8fd
7 changed files with 36 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/ansible/modules/files/unarchive.py
View File

@@ -695,7 +695,8 @@ def main():
f.write(data)
f.close()
src = package
except Exception, e:
except Exception:
e = get_exception()
module.fail_json(msg="Failure downloading %s, %s" % (src, e))
else:
module.fail_json(msg="Source '%s' does not exist" % src)
@@ -706,7 +707,8 @@ def main():
try:
if os.path.getsize(src) == 0:
module.fail_json(msg="Invalid archive '%s', the file is 0 bytes" % src)
except Exception, e:
except Exception:
e = get_exception()
module.fail_json(msg="Source '%s' not readable" % src)
# is dest OK to receive tar file?
@@ -746,7 +748,8 @@ def main():
file_args['path'] = os.path.join(dest, filename)
try:
res_args['changed'] = module.set_fs_attributes_if_different(file_args, res_args['changed'])
except (IOError, OSError), e:
except (IOError, OSError):
e = get_exception()
module.fail_json(msg="Unexpected error when accessing exploded file: %s" % str(e))
if module.params['list_files']: