From a7ca488a8ece7ac83d02937d3ee3b97f481ddc1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Neuh=C3=A4user?= <ich@danielneuhaeuser.de>
Date: Sat, 10 Jul 2010 19:47:32 +0200
Subject: [PATCH] Removed XMLParser._fixtext which fixes several errors in the
 test suite

---
 tests/etree13/ElementTree.py | 17 ++++-------------
 tests/test_build_html.py     |  2 +-
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/tests/etree13/ElementTree.py b/tests/etree13/ElementTree.py
index d37325049..e50ad640c 100644
--- a/tests/etree13/ElementTree.py
+++ b/tests/etree13/ElementTree.py
@@ -1425,13 +1425,6 @@ class XMLParser(object):
         err.position = value.lineno, value.offset
         raise err
 
-    def _fixtext(self, text):
-        # convert text string to ascii, if possible
-        try:
-            return text.encode("ascii")
-        except UnicodeError:
-            return text
-
     def _fixname(self, key):
         # expand qname, and convert name string to ascii, if possible
         try:
@@ -1440,30 +1433,28 @@ class XMLParser(object):
             name = key
             if "}" in name:
                 name = "{" + name
-            self._names[key] = name = self._fixtext(name)
+            self._names[key]
         return name
 
     def _start(self, tag, attrib_in):
         fixname = self._fixname
-        fixtext = self._fixtext
         tag = fixname(tag)
         attrib = {}
         for key, value in attrib_in.items():
-            attrib[fixname(key)] = fixtext(value)
+            attrib[fixname(key)] = value
         return self.target.start(tag, attrib)
 
     def _start_list(self, tag, attrib_in):
         fixname = self._fixname
-        fixtext = self._fixtext
         tag = fixname(tag)
         attrib = {}
         if attrib_in:
             for i in range(0, len(attrib_in), 2):
-                attrib[fixname(attrib_in[i])] = fixtext(attrib_in[i+1])
+                attrib[fixname(attrib_in[i])] = attrib_in[i+1]
         return self.target.start(tag, attrib)
 
     def _data(self, text):
-        return self.target.data(self._fixtext(text))
+        return self.target.data(text)
 
     def _end(self, tag):
         return self.target.end(self._fixname(tag))
diff --git a/tests/test_build_html.py b/tests/test_build_html.py
index 65c1840ea..5e3a20188 100644
--- a/tests/test_build_html.py
+++ b/tests/test_build_html.py
@@ -258,7 +258,7 @@ class NslessParser(ET.XMLParser):
             br = name.find('}')
             if br > 0:
                 name = name[br+1:]
-            self._names[key] = name = self._fixtext(name)
+            self._names[key] = name
             return name