summaryrefslogtreecommitdiffstats
path: root/Lib/xml
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2013-05-12 09:52:22 (GMT)
committerGeorg Brandl <georg@python.org>2013-05-12 09:52:22 (GMT)
commit64949fa20e4845e92a1d42f581a47b559a9acd25 (patch)
tree8db8e84c247d6a23bf88a5527e1d571676c9edf4 /Lib/xml
parenta9417d7f0e570e3017c2c9917c65248595249221 (diff)
parentc502df4e3e00ec2481f1f0a80af37c9d822787b3 (diff)
downloadcpython-64949fa20e4845e92a1d42f581a47b559a9acd25.zip
cpython-64949fa20e4845e92a1d42f581a47b559a9acd25.tar.gz
cpython-64949fa20e4845e92a1d42f581a47b559a9acd25.tar.bz2
merge with 3.2
Diffstat (limited to 'Lib/xml')
-rw-r--r--Lib/xml/sax/saxutils.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/Lib/xml/sax/saxutils.py b/Lib/xml/sax/saxutils.py
index a62183a..0798ecd 100644
--- a/Lib/xml/sax/saxutils.py
+++ b/Lib/xml/sax/saxutils.py
@@ -5,6 +5,7 @@ convenience of application and driver writers.
import os, urllib.parse, urllib.request
import io
+import codecs
from . import handler
from . import xmlreader
@@ -77,6 +78,10 @@ def _gettextwriter(out, encoding):
# use a text writer as is
return out
+ if isinstance(out, (codecs.StreamWriter, codecs.StreamReaderWriter)):
+ # use a codecs stream writer as is
+ return out
+
# wrap a binary writer with TextIOWrapper
if isinstance(out, io.RawIOBase):
# Keep the original file open when the TextIOWrapper is