Allow encoding names to be unicode strings.

af199faa · Guido van Rossum · 583118a5 · af199faa
Commit af199faa authored May 17, 2007 by Guido van Rossum
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 0 deletions

Modules/cjkcodecs/cjkcodecs.h Modules/cjkcodecs/cjkcodecs.h +5 -0

No files found.
--- 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.");