Merge pull request #6313 from phenomenes/msg-encoding-fix
Don't use keyword `error` in encode
This commit is contained in:
commit
acd64bf5a1
1 changed files with 2 additions and 1 deletions
|
@ -597,7 +597,8 @@ def main():
|
|||
except psycopg2.Error, e:
|
||||
conn.rollback()
|
||||
# psycopg2 errors come in connection encoding, reencode
|
||||
msg = e.message.decode(conn.encoding).encode(errors='replace')
|
||||
msg = e.message.decode(conn.encoding).encode(sys.getdefaultencoding(),
|
||||
'replace')
|
||||
module.fail_json(msg=msg)
|
||||
|
||||
if module.check_mode:
|
||||
|
|
Loading…
Reference in a new issue