Allow encoding names to be unicode strings.

diff --git a/Modules/cjkcodecs/cjkcodecs.h b/Modules/cjkcodecs/cjkcodecs.h
index 71c54f093fc96a24ef11f8fb3fa57453d5e64c56..c79b304a03831d97997068afb02f9d39fed1767d 100644 (file)
--- a/Modules/cjkcodecs/cjkcodecs.h
+++ b/Modules/cjkcodecs/cjkcodecs.h
@@ -261,6 +261,11 @@ getcodec(PyObject *self, PyObject *encoding)
        const MultibyteCodec *codec;
        const char *enc;
 
+        if (PyUnicode_Check(encoding)) {
+               encoding = _PyUnicode_AsDefaultEncodedString(encoding, NULL);
+               if (encoding == NULL)
+                       return NULL;
+       }
        if (!PyString_Check(encoding)) {
                PyErr_SetString(PyExc_TypeError,
                                "encoding name must be a string.");