ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-07-02 06:30:19 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Fixed exceptions to use python 2.4 helper function and added import also works on python 3 (#2363)

Browse source
This commit is contained in:
Chris Weber 2016-06-02 11:58:38 -07:00 • committed by Matt Clay
parent 25b79bafd2
commit e30049d113
3 changed files with 25 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

19
lib/ansible/modules/extras/web_infrastructure/ejabberd_user.py
View file

@ -68,6 +68,8 @@ Example playbook entries using the ejabberd_user module to manage users state.
action: ejabberd_user username=test host=server state=absent
'''
import syslog
from ansible.module_utils.pycompat24 import get_exception
from ansible.module_utils.basic import *
class EjabberdUserException(Exception):
""" Base exeption for EjabberdUser class object """
@ -98,7 +100,8 @@ class EjabberdUser(object):
try:
options = [self.user, self.host, self.pwd]
(rc, out, err) = self.run_command('check_password', options)
except EjabberdUserException, e:
except EjabberdUserException:
e = get_exception()
(rc, out, err) = (1, None, "required attribute(s) missing")
return rc
@ -111,7 +114,8 @@ class EjabberdUser(object):
try:
options = [self.user, self.host]
(rc, out, err) = self.run_command('check_account', options)
except EjabberdUserException, e:
except EjabberdUserException:
e = get_exception()
(rc, out, err) = (1, None, "required attribute(s) missing")
return not bool(int(rc))
@ -139,7 +143,8 @@ class EjabberdUser(object):
try:
options = [self.user, self.host, self.pwd]
(rc, out, err) = self.run_command('change_password', options)
except EjabberdUserException, e:
except EjabberdUserException:
e = get_exception()
(rc, out, err) = (1, None, "required attribute(s) missing")
return (rc, out, err)
@ -150,7 +155,8 @@ class EjabberdUser(object):
try:
options = [self.user, self.host, self.pwd]
(rc, out, err) = self.run_command('register', options)
except EjabberdUserException, e:
except EjabberdUserException:
e = get_exception()
(rc, out, err) = (1, None, "required attribute(s) missing")
return (rc, out, err)
@ -160,7 +166,8 @@ class EjabberdUser(object):
try:
options = [self.user, self.host]
(rc, out, err) = self.run_command('unregister', options)
except EjabberdUserException, e:
except EjabberdUserException:
e = get_exception()
(rc, out, err) = (1, None, "required attribute(s) missing")
return (rc, out, err)
@ -209,6 +216,4 @@ def main():
module.exit_json(**result)
# import module snippets
from ansible.module_utils.basic import *
main()