Don't use keyword error in encode

This is not supported in Python 2.6. Just use positional arguments.
This commit is contained in:
Jimena Cabrera-Notari 2014-03-06 13:33:53 +00:00
parent 40ee030790
commit cc6e1ec261

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: