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

Convert all databases modules to python3 and 2.4 syntax (#3688)

Browse source
This commit is contained in:
Michael Scherer 2016-05-18 16:07:21 +02:00 • committed by Matt Clay
parent f7b29ba8fd
commit 09066f1518
6 changed files with 54 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

9
lib/ansible/modules/database/mysql/mysql_db.py
View file

@ -289,7 +289,8 @@ def main():
try:
cursor = mysql_connect(module, login_user, login_password, config_file, ssl_cert, ssl_key, ssl_ca,
connect_timeout=connect_timeout)
except Exception, e:
except Exception:
e = get_exception()
if os.path.exists(config_file):
module.fail_json(msg="unable to connect to database, check login_user and login_password are correct or %s has the credentials. Exception message: %s" % (config_file, e))
else:
@ -305,7 +306,8 @@ def main():
else:
try:
changed = db_delete(cursor, db)
except Exception, e:
except Exception:
e = get_exception()
module.fail_json(msg="error deleting database: " + str(e))
elif state == "dump":
if module.check_mode:
@ -336,7 +338,8 @@ def main():
else:
try:
changed = db_create(cursor, db, encoding, collation)
except Exception, e:
except Exception:
e = get_exception()
module.fail_json(msg="error creating database: " + str(e))
module.exit_json(changed=changed, db=db)

15
lib/ansible/modules/database/mysql/mysql_user.py
View file

@ -541,7 +541,8 @@ def main():
if not cursor:
cursor = mysql_connect(module, login_user, login_password, config_file, ssl_cert, ssl_key, ssl_ca, db,
connect_timeout=connect_timeout)
except Exception, e:
except Exception:
e = get_exception()
module.fail_json(msg="unable to connect to database, check login_user and login_password are correct or %s has the credentials. Exception message: %s" % (config_file, e))
if not sql_log_bin:
@ -550,11 +551,13 @@ def main():
if priv is not None:
try:
mode = get_mode(cursor)
except Exception, e:
except Exception:
e = get_exception()
module.fail_json(msg=str(e))
try:
priv = privileges_unpack(priv, mode)
except Exception, e:
except Exception:
e = get_exception()
module.fail_json(msg="invalid privileges string: %s" % str(e))
if state == "present":
@ -565,14 +568,16 @@ def main():
else:
changed = user_mod(cursor, user, host, host_all, None, encrypted, priv, append_privs, module)
except (SQLParseError, InvalidPrivsError, MySQLdb.Error), e:
except (SQLParseError, InvalidPrivsError, MySQLdb.Error):
e = get_exception()
module.fail_json(msg=str(e))
else:
if host_all:
module.fail_json(msg="host_all parameter cannot be used when adding a user")
try:
changed = user_add(cursor, user, host, host_all, password, encrypted, priv, module.check_mode)
except (SQLParseError, InvalidPrivsError, MySQLdb.Error), e:
except (SQLParseError, InvalidPrivsError, MySQLdb.Error):
e = get_exception()
module.fail_json(msg=str(e))
elif state == "absent":
if user_exists(cursor, user, host, host_all):

11
lib/ansible/modules/database/mysql/mysql_variables.py
View file

@ -109,7 +109,8 @@ def setvariable(cursor, mysqlvar, value):
cursor.execute(query + "%s", (value,))
cursor.fetchall()
result = True
except Exception, e:
except Exception:
e = get_exception()
result = str(e)
return result
@ -153,7 +154,8 @@ def main():
try:
cursor = mysql_connect(module, user, password, config_file, ssl_cert, ssl_key, ssl_ca, db,
connect_timeout=connect_timeout)
except Exception, e:
except Exception:
e = get_exception()
if os.path.exists(config_file):
module.fail_json(msg="unable to connect to database, check login_user and login_password are correct or %s has the credentials. Exception message: %s" % (config_file, e))
else:
@ -172,7 +174,8 @@ def main():
module.exit_json(msg="Variable already set to requested value", changed=False)
try:
result = setvariable(cursor, mysqlvar, value_wanted)
except SQLParseError, e:
except SQLParseError:
e = get_exception()
result = str(e)
if result is True:
module.exit_json(msg="Variable change succeeded prev_value=%s" % value_actual, changed=True)
@ -184,4 +187,4 @@ from ansible.module_utils.basic import *
from ansible.module_utils.database import *
from ansible.module_utils.mysql import *
if __name__ == '__main__':
main()
main()