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

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

15
lib/ansible/modules/database/postgresql/postgresql_db.py
View file

@ -280,7 +280,8 @@ def main():
.ISOLATION_LEVEL_AUTOCOMMIT)
cursor = db_connection.cursor(
cursor_factory=psycopg2.extras.DictCursor)
except Exception, e:
except Exception:
e = get_exception()
module.fail_json(msg="unable to connect to database: %s" % e)
try:
@ -295,21 +296,25 @@ def main():
if state == "absent":
try:
changed = db_delete(cursor, db)
except SQLParseError, e:
except SQLParseError:
e = get_exception()
module.fail_json(msg=str(e))
elif state == "present":
try:
changed = db_create(cursor, db, owner, template, encoding,
lc_collate, lc_ctype)
except SQLParseError, e:
except SQLParseError:
e = get_exception()
module.fail_json(msg=str(e))
except NotSupportedError, e:
except NotSupportedError:
e = get_exception()
module.fail_json(msg=str(e))
except SystemExit:
# Avoid catching this on Python 2.4
raise
except Exception, e:
except Exception:
e = get_exception()
module.fail_json(msg="Database query failed: %s" % e)
module.exit_json(changed=changed, db=db)