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

Fixed exception handeling for Python 2.4 and python 3 compatablity (#2364)

Browse source
This commit is contained in:
Chris Weber 2016-06-04 16:31:54 -07:00 • committed by Matt Clay
parent 1b4a458417
commit 2579934ae0
3 changed files with 16 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lib/ansible/modules/extras/source_control/gitlab_user.py
View file

@ -137,6 +137,9 @@ try:
except:
HAS_GITLAB_PACKAGE = False
from ansible.module_utils.pycompat24 import get_exception
from ansible.module_utils.basic import *
class GitLabUser(object):
def __init__(self, module, git):
@ -325,7 +328,8 @@ def main():
git.login(user=login_user, password=login_password)
else:
git = gitlab.Gitlab(server_url, token=login_token, verify_ssl=verify_ssl)
except Exception, e:
except Exception:
e = get_exception()
module.fail_json(msg="Failed to connect to Gitlab server: %s " % e)
# Validate if group exists and take action based on "state"
@ -342,7 +346,6 @@ def main():
user.createOrUpdateUser(user_name, user_username, user_password, user_email, user_sshkey_name, user_sshkey_file, group_name, access_level)
from ansible.module_utils.basic import *
if __name__ == '__main__':
main()