[Bug #1281032] Pass encoding from the input source to pyexpat's ParserCreate()

diff --git a/Lib/xml/sax/expatreader.py b/Lib/xml/sax/expatreader.py
index ab8cbc1244bb48dff0ef3b0b2d95484eae759805..bb9c294e5ed66ef54322dada145c774f4f0ae502 100644 (file)
--- a/Lib/xml/sax/expatreader.py
+++ b/Lib/xml/sax/expatreader.py
@@ -243,13 +243,14 @@ class ExpatParser(xmlreader.IncrementalParser, xmlreader.Locator):
 
     def reset(self):
         if self._namespaces:
-            self._parser = expat.ParserCreate(None, " ",
+            self._parser = expat.ParserCreate(self._source.getEncoding(), " ",
                                               intern=self._interning)
             self._parser.namespace_prefixes = 1
             self._parser.StartElementHandler = self.start_element_ns
             self._parser.EndElementHandler = self.end_element_ns
         else:
-            self._parser = expat.ParserCreate(intern = self._interning)
+            self._parser = expat.ParserCreate(self._source.getEncoding(),
+                                              intern = self._interning)
             self._parser.StartElementHandler = self.start_element
             self._parser.EndElementHandler = self.end_element