summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorMarc-André Lemburg <mal@egenix.com>2001-11-20 15:18:49 (GMT)
committerMarc-André Lemburg <mal@egenix.com>2001-11-20 15:18:49 (GMT)
commit72f8213ba4b960bdf540a1cc494ac699170c9dec (patch)
tree0d1b57a65d1b91b86e525591c8654fa5ab41ae33 /Lib
parent0c4d8d05a8b10c8c611eae0fbe70898050f12ad4 (diff)
downloadcpython-72f8213ba4b960bdf540a1cc494ac699170c9dec.zip
cpython-72f8213ba4b960bdf540a1cc494ac699170c9dec.tar.gz
cpython-72f8213ba4b960bdf540a1cc494ac699170c9dec.tar.bz2
Fix for bug #438164: %-formatting using Unicode objects.
This patch also does away with an incompatibility between Jython and CPython.
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/test_unicode.py5
1 files changed, 1 insertions, 4 deletions
diff --git a/Lib/test/test_unicode.py b/Lib/test/test_unicode.py
index b859fbb..c701e44 100644
--- a/Lib/test/test_unicode.py
+++ b/Lib/test/test_unicode.py
@@ -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: