Added utility method to return a string in the connection encoding.

In Py2 the result is plain string, in Py3 an unicode decoded in the
connection encoding.

1 files changed, 9 insertions, 9 deletions

diff --git a/psycopg/psycopgmodule.c b/psycopg/psycopgmodule.c
index 568cf6e..d580fa0 100644
--- a/psycopg/psycopgmodule.c
+++ b/psycopg/psycopgmodule.c
@@ -582,26 +582,26 @@ psyco_set_error(PyObject *exc, PyObject *curs, const char *msg,
     PyObject *err = PyObject_CallFunction(exc, "s", msg);
 
     if (err) {
+        connectionObject *conn = NULL;
+        if (curs) {
+            PyObject_SetAttrString(err, "cursor", curs);
+            conn = ((cursorObject *)curs)->conn;
+        }
+
         if (pgerror) {
-            /* XXX is this always ASCII? If not, it needs
-               to be decoded properly for Python 3. */
-            t = Text_FromUTF8(pgerror);
+            t = conn_text_from_chars(conn, pgerror);
             PyObject_SetAttrString(err, "pgerror", t);
             Py_DECREF(t);
         }
 
         if (pgcode) {
-            /* XXX likewise */
-            t = Text_FromUTF8(pgcode);
+            t = conn_text_from_chars(conn, pgcode);
             PyObject_SetAttrString(err, "pgcode", t);
             Py_DECREF(t);
         }
 
-        if (curs)
-            PyObject_SetAttrString(err, "cursor", curs);
-
         PyErr_SetObject(exc, err);
-    Py_DECREF(err);
+        Py_DECREF(err);
     }
 }