ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

Make postgresql module in extras compile on py3

Browse source
This commit is contained in:
Michael Scherer 2016-10-16 16:57:57 +02:00 committed by Matt Clay
parent 6963cd8ae7
commit 95929fb79f
3 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/ansible/modules/extras/database/postgresql/postgresql_ext.py
View file

@ -159,7 +159,8 @@ def main():
.ISOLATION_LEVEL_AUTOCOMMIT) .ISOLATION_LEVEL_AUTOCOMMIT)
cursor = db_connection.cursor( cursor = db_connection.cursor(
cursor_factory=psycopg2.extras.DictCursor) cursor_factory=psycopg2.extras.DictCursor)
except Exception, e: except Exception:
e = get_exception()
module.fail_json(msg="unable to connect to database: %s" % e) module.fail_json(msg="unable to connect to database: %s" % e)
try: try:
@ -174,14 +175,17 @@ def main():
elif state == "present": elif state == "present":
changed = ext_create(cursor, ext) changed = ext_create(cursor, ext)
except NotSupportedError, e: except NotSupportedError:
e = get_exception()
module.fail_json(msg=str(e)) module.fail_json(msg=str(e))
except Exception, e: except Exception:
e = get_exception()
module.fail_json(msg="Database query failed: %s" % e) module.fail_json(msg="Database query failed: %s" % e)
module.exit_json(changed=changed, db=db, ext=ext) module.exit_json(changed=changed, db=db, ext=ext)
# import module snippets # import module snippets
from ansible.module_utils.basic import * from ansible.module_utils.basic import *
from ansible.module_utils.pycompat24 import get_exception
main() main()

4
lib/ansible/modules/extras/database/postgresql/postgresql_lang.py
View file

@ -222,7 +222,8 @@ def main():
try: try:
db_connection = psycopg2.connect(**kw) db_connection = psycopg2.connect(**kw)
cursor = db_connection.cursor() cursor = db_connection.cursor()
except Exception, e: except Exception:
e = get_exception()
module.fail_json(msg="unable to connect to database: %s" % e) module.fail_json(msg="unable to connect to database: %s" % e)
changed = False changed = False
lang_dropped = False lang_dropped = False
@ -267,4 +268,5 @@ def main():
# import module snippets # import module snippets
from ansible.module_utils.basic import * from ansible.module_utils.basic import *
from ansible.module_utils.pycompat24 import get_exception
main() main()

2
lib/ansible/modules/extras/test/utils/shippable/sanity-skip-python3.txt
View file

@ -40,8 +40,6 @@
/clustering/consul_kv.py /clustering/consul_kv.py
/clustering/consul_session.py /clustering/consul_session.py
/database/mysql/mysql_replication.py /database/mysql/mysql_replication.py
/database/postgresql/postgresql_ext.py
/database/postgresql/postgresql_lang.py
/database/vertica/vertica_configuration.py /database/vertica/vertica_configuration.py
/database/vertica/vertica_facts.py /database/vertica/vertica_facts.py
/database/vertica/vertica_role.py /database/vertica/vertica_role.py