summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@haypocalc.com>2011-07-03 23:25:55 (GMT)
committerVictor Stinner <victor.stinner@haypocalc.com>2011-07-03 23:25:55 (GMT)
commitbbdc08ea6e5d3f2d9058991a65b6011dfbb8d233 (patch)
tree1315eaeacd4a092e5ae452c1f74049d0d9903fb1
parentac91341333d27bf39dd8b8c1c3164b5bdc19f03b (diff)
downloadcpython-bbdc08ea6e5d3f2d9058991a65b6011dfbb8d233.zip
cpython-bbdc08ea6e5d3f2d9058991a65b6011dfbb8d233.tar.gz
cpython-bbdc08ea6e5d3f2d9058991a65b6011dfbb8d233.tar.bz2
Issue #12451: xml.dom.pulldom: parse() now opens files in binary mode instead
of the text mode (using the locale encoding) to avoid encoding issues.
-rw-r--r--Lib/xml/dom/pulldom.py2
-rw-r--r--Misc/NEWS3
2 files changed, 4 insertions, 1 deletions
diff --git a/Lib/xml/dom/pulldom.py b/Lib/xml/dom/pulldom.py
index 81a36b0..d5ac8b2 100644
--- a/Lib/xml/dom/pulldom.py
+++ b/Lib/xml/dom/pulldom.py
@@ -326,7 +326,7 @@ def parse(stream_or_string, parser=None, bufsize=None):
if bufsize is None:
bufsize = default_bufsize
if isinstance(stream_or_string, str):
- stream = open(stream_or_string)
+ stream = open(stream_or_string, 'rb')
else:
stream = stream_or_string
if not parser:
diff --git a/Misc/NEWS b/Misc/NEWS
index 250acc2..1d76698 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -19,6 +19,9 @@ Core and Builtins
Library
-------
+- Issue #12451: xml.dom.pulldom: parse() now opens files in binary mode instead
+ of the text mode (using the locale encoding) to avoid encoding issues.
+
C-API
-----