From f2ce143609d8eb2af9b3d8f6f89f7dd4ea68eb22 Mon Sep 17 00:00:00 2001 From: Michael Scherer Date: Sun, 16 Oct 2016 16:57:57 +0200 Subject: Make postgresql module in extras compile on py3 --- database/postgresql/postgresql_ext.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'database/postgresql/postgresql_ext.py') diff --git a/database/postgresql/postgresql_ext.py b/database/postgresql/postgresql_ext.py index f9b0d957..39c74afb 100644 --- a/database/postgresql/postgresql_ext.py +++ b/database/postgresql/postgresql_ext.py @@ -159,7 +159,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: @@ -174,14 +175,17 @@ def main(): elif state == "present": changed = ext_create(cursor, ext) - except NotSupportedError, e: + except NotSupportedError: + e = get_exception() module.fail_json(msg=str(e)) - except Exception, e: + except Exception: + e = get_exception() module.fail_json(msg="Database query failed: %s" % e) module.exit_json(changed=changed, db=db, ext=ext) # import module snippets from ansible.module_utils.basic import * +from ansible.module_utils.pycompat24 import get_exception main() -- cgit v1.2.1