cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #6313 from phenomenes/msg-encoding-fix

Browse source 
Don't use keyword `error` in encode
This commit is contained in:
Michael DeHaan 2014-03-06 10:59:11 -06:00
commit bd26ade5b9
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
database/postgresql_privs
View file

@ -597,7 +597,8 @@ def main():
except psycopg2.Error, e: except psycopg2.Error, e:
conn.rollback() conn.rollback()
# psycopg2 errors come in connection encoding, reencode # 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) module.fail_json(msg=msg)
if module.check_mode: if module.check_mode: