Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Fix for bug #438164: %-formatting using Unicode objects. 

This patch also does away with an incompatibility between Jython
and CPython.
This commit is contained in:
Marc-André Lemburg 2001-11-20 15:18:49 +00:00
parent 0c4d8d05a8
commit 72f8213ba4
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Lib/test/test_unicode.py
View File

@ -362,10 +362,7 @@ if sys.platform[:4] != 'java':
verify(u"%(x)s, %(y)s" % {'x':u"abc", 'y':"def"} == u'abc, def')
try:
if sys.platform[:4] != 'java':
value = u"%(x)s, %(ä)s" % {'x':u"abc", u'ä'.encode('utf-8'):"def"}
else:
value = u"%(x)s, %(ä)s" % {'x':u"abc", u'ä':"def"}
value = u"%(x)s, %(ä)s" % {'x':u"abc", u'ä':"def"}
except KeyError:
print '*** formatting failed for "%s"' % "u'abc, def'"
else:

4
Objects/unicodeobject.c
View File

@ -5300,6 +5300,7 @@ PyObject *PyUnicode_Format(PyObject *format,
"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 @@ PyObject *PyUnicode_Format(PyObject *format,
key = PyUnicode_EncodeUTF8(keystart,
keylen,
NULL);
#else
key = PyUnicode_FromUnicode(keystart, keylen);
#endif
if (key == NULL)
goto onError;
if (args_owned) {