Fix for bug #438164: %-formatting using Unicode objects.
This patch also does away with an incompatibility between Jython
and CPython.
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index 57ef62a..1420455 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -5300,6 +5300,7 @@
"incomplete format key");
goto onError;
}
+#if 0
/* keys are converted to strings using UTF-8 and
then looked up since Python uses strings to hold
variables names etc. in its namespaces and we
@@ -5307,6 +5308,9 @@
key = PyUnicode_EncodeUTF8(keystart,
keylen,
NULL);
+#else
+ key = PyUnicode_FromUnicode(keystart, keylen);
+#endif
if (key == NULL)
goto onError;
if (args_owned) {