ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-04-24 03:11:24 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Use 'except ... as' syntax

Browse source 
This syntax works on Python 2.6 through 3.x.  lib/ansible/module_utils
(and lib/ansible/modules) need to support Python 2.4, so I didn't touch
those.
This commit is contained in:
Marius Gedminas 2015-08-27 09:16:11 +03:00
parent 2ac931d6c9
commit 0c6ce31f76
24 changed files with 51 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/ansible/executor/task_executor.py
View file

@ -125,14 +125,14 @@ class TaskExecutor:
result = json.dumps(res)
debug("done dumping result, returning")
return result
except AnsibleError, e:
except AnsibleError as e:
return dict(failed=True, msg=to_unicode(e, nonstring='simplerepr'))
finally:
try:
self._connection.close()
except AttributeError:
pass
except Exception, e:
except Exception as e:
debug("error closing connection: %s" % to_unicode(e))
def _get_loop_items(self):
@ -187,7 +187,7 @@ class TaskExecutor:
try:
tmp_task = self._task.copy()
except AnsibleParserError, e:
except AnsibleParserError as e:
results.append(dict(failed=True, msg=str(e)))
continue