From: Martin v. Löwis <martin@v.loewis.de>
Date: Mon, 11 Jun 2007 04:19:13 +0000 (+0000)
Subject: Short-cut lookup of utf-8 codec, to make import work
X-Git-Tag: v3.0a1~799
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=641d5cc6a61e19a01d62b61b6b5b5d9dd8663d12;p=thirdparty%2FPython%2Fcpython.git

Short-cut lookup of utf-8 codec, to make import work
on OSX.
---

diff --git a/Python/codecs.c b/Python/codecs.c
index 3aa1f386e7be..1ba600912262 100644
--- a/Python/codecs.c
+++ b/Python/codecs.c
@@ -319,6 +319,23 @@ PyObject *PyCodec_Encode(PyObject *object,
     PyObject *args = NULL, *result = NULL;
     PyObject *v;
 
+    /* XXX short-cut a few common file system 
+       encodings for now, as otherwise the import
+       code can't load the codec registry. */
+    if (strcmp(encoding, "utf-8") == 0 && PyUnicode_Check(object)) {
+	return PyUnicode_EncodeUTF8(PyUnicode_AS_UNICODE(object),
+				    PyUnicode_GET_SIZE(object),
+				    errors);
+    }
+#if defined(MS_WINDOWS) && defined(HAVE_USABLE_WCHAR_T)
+    if (strcmp(encoding, "mbcs") == 0 && PyUnicode_Check(object)) {
+	return PyUnicode_EncodeMBCS(PyUnicode_AS_UNICODE(object),
+				    PyUnicode_GET_SIZE(object),
+				    errors);
+    }
+#endif
+
+
     encoder = PyCodec_Encoder(encoding);
     if (encoder == NULL)
 	goto onError;