Use psycopg_ensure_bytes() to unify Py2/3 code paths.

1 files changed, 2 insertions, 14 deletions

diff --git a/psycopg/connection_int.c b/psycopg/connection_int.c
index 2188993..6d87622 100644
--- a/psycopg/connection_int.c
+++ b/psycopg/connection_int.c
@@ -235,20 +235,8 @@ conn_encoding_to_codec(const char *enc)
         goto exit;
     }
 
-    /* Convert the codec in a bytes string to extract the c string.
-     * At the end of the block we have pybenc with a new ref. */
-    if (PyUnicode_Check(pyenc)) {
-        if (!(pybenc = PyUnicode_AsEncodedString(pyenc, "ascii", NULL))) {
-            goto exit;
-        }
-    }
-    else if (Bytes_Check(pyenc)) {
-        Py_INCREF(pyenc);
-        pybenc = pyenc;
-    }
-    else {
-        PyErr_Format(PyExc_TypeError, "bad type for encoding: %s",
-            Py_TYPE(pyenc)->tp_name);
+    /* Convert the codec in a bytes string to extract the c string. */
+    if (!(pybenc = psycopg_ensure_bytes(pyenc))) {
         goto exit;
     }