diff options
Diffstat (limited to 'database/postgresql/postgresql_user.py')
| -rw-r--r-- | database/postgresql/postgresql_user.py | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/database/postgresql/postgresql_user.py b/database/postgresql/postgresql_user.py index 4f217433..2d65ba4e 100644 --- a/database/postgresql/postgresql_user.py +++ b/database/postgresql/postgresql_user.py @@ -290,7 +290,8 @@ def user_alter(cursor, module, user, password, role_attr_flags, encrypted, expir try: cursor.execute(' '.join(alter), query_password_data) - except psycopg2.InternalError, e: + except psycopg2.InternalError: + e = get_exception() if e.pgcode == '25006': # Handle errors due to read-only transactions indicated by pgcode 25006 # ERROR: cannot execute ALTER ROLE in a read-only transaction @@ -298,7 +299,7 @@ def user_alter(cursor, module, user, password, role_attr_flags, encrypted, expir module.fail_json(msg=e.pgerror) return changed else: - raise psycopg2.InternalError, e + raise psycopg2.InternalError(e) # Grab new role attributes. cursor.execute(select, {"user": user}) @@ -575,7 +576,8 @@ def main(): no_password_changes = module.params["no_password_changes"] try: role_attr_flags = parse_role_attrs(module.params["role_attr_flags"]) - except InvalidFlagsError, e: + except InvalidFlagsError: + e = get_exception() module.fail_json(msg=str(e)) if module.params["encrypted"]: encrypted = "ENCRYPTED" @@ -607,7 +609,8 @@ def main(): try: db_connection = psycopg2.connect(**kw) 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) kw = dict(user=user) @@ -618,16 +621,19 @@ def main(): if user_exists(cursor, user): try: changed = user_alter(cursor, module, user, password, role_attr_flags, encrypted, expires, no_password_changes) - except SQLParseError, e: + except SQLParseError: + e = get_exception() module.fail_json(msg=str(e)) else: try: changed = user_add(cursor, user, password, role_attr_flags, encrypted, expires) - except SQLParseError, e: + except SQLParseError: + e = get_exception() module.fail_json(msg=str(e)) try: changed = grant_privileges(cursor, user, privs) or changed - except SQLParseError, e: + except SQLParseError: + e = get_exception() module.fail_json(msg=str(e)) else: if user_exists(cursor, user): @@ -638,7 +644,8 @@ def main(): try: changed = revoke_privileges(cursor, user, privs) user_removed = user_delete(cursor, user) - except SQLParseError, e: + except SQLParseError: + e = get_exception() module.fail_json(msg=str(e)) changed = changed or user_removed if fail_on_user and not user_removed: |