mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
* ModuleHelperException module utils - improved exception initialization
* added changelog fragment
* Update plugins/module_utils/mh/exceptions.py
Co-authored-by: Felix Fontein <felix@fontein.de>
Co-authored-by: Felix Fontein <felix@fontein.de>
(cherry picked from commit b87edda3c7
)
Co-authored-by: Alexei Znamensky <103110+russoz@users.noreply.github.com>
This commit is contained in:
parent
d91c6fedc2
commit
7ec8b50361
2 changed files with 9 additions and 11 deletions
2
changelogs/fragments/4755-mhexception-improvement.yml
Normal file
2
changelogs/fragments/4755-mhexception-improvement.yml
Normal file
|
@ -0,0 +1,2 @@
|
||||||
|
minor_changes:
|
||||||
|
- ModuleHelper module utils - improved ``ModuleHelperException``, using ``to_native()`` for the exception message (https://github.com/ansible-collections/community.general/pull/4755).
|
|
@ -6,17 +6,13 @@
|
||||||
from __future__ import absolute_import, division, print_function
|
from __future__ import absolute_import, division, print_function
|
||||||
__metaclass__ = type
|
__metaclass__ = type
|
||||||
|
|
||||||
|
from ansible.module_utils.common.text.converters import to_native
|
||||||
|
|
||||||
|
|
||||||
class ModuleHelperException(Exception):
|
class ModuleHelperException(Exception):
|
||||||
@staticmethod
|
def __init__(self, msg, update_output=None, *args, **kwargs):
|
||||||
def _get_remove(key, kwargs):
|
self.msg = to_native(msg or "Module failed with exception: {0}".format(self))
|
||||||
if key in kwargs:
|
if update_output is None:
|
||||||
result = kwargs[key]
|
update_output = {}
|
||||||
del kwargs[key]
|
self.update_output = update_output
|
||||||
return result
|
|
||||||
return None
|
|
||||||
|
|
||||||
def __init__(self, *args, **kwargs):
|
|
||||||
self.msg = self._get_remove('msg', kwargs) or "Module failed with exception: {0}".format(self)
|
|
||||||
self.update_output = self._get_remove('update_output', kwargs) or {}
|
|
||||||
super(ModuleHelperException, self).__init__(*args)
|
super(ModuleHelperException, self).__init__(*args)
|
||||||
|
|
Loading…
Reference in a new issue