From 1b0be2d4c64b11b0884b625d6c62259e0c51424b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Walter=20D=C3=B6rwald?= Date: Tue, 29 Apr 2003 20:59:55 +0000 Subject: [PATCH] Use the new htmlentitydefs.codepoint2name for test_xmlcharnamereplace() --- Lib/test/test_codeccallbacks.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/Lib/test/test_codeccallbacks.py b/Lib/test/test_codeccallbacks.py index f7a07ee52c4..5c7243ad137 100644 --- a/Lib/test/test_codeccallbacks.py +++ b/Lib/test/test_codeccallbacks.py @@ -37,12 +37,6 @@ def test_xmlcharrefreplace(self): def test_xmlcharnamereplace(self): # This time use a named character entity for unencodable # characters, if one is available. - names = {} - for (key, value) in htmlentitydefs.entitydefs.items(): - if len(value)==1: - names[unicode(value, "latin-1")] = unicode(key, "latin-1") - else: - names[unichr(int(value[2:-1]))] = unicode(key, "latin-1") def xmlcharnamereplace(exc): if not isinstance(exc, UnicodeEncodeError): @@ -50,7 +44,7 @@ def xmlcharnamereplace(exc): l = [] for c in exc.object[exc.start:exc.end]: try: - l.append(u"&%s;" % names[c]) + l.append(u"&%s;" % htmlentitydefs.codepoint2name[ord(c)]) except KeyError: l.append(u"&#%d;" % ord(c)) return (u"".join(l), exc.end)