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

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)