diff options
| author | Guido van Rossum <guido@python.org> | 2007-08-09 01:03:29 (GMT) |
|---|---|---|
| committer | Guido van Rossum <guido@python.org> | 2007-08-09 01:03:29 (GMT) |
| commit | 34d1928766bcae11d8f679a6bf361d9210b6429e (patch) | |
| tree | 0b3d5842a690f811fa03f3b52420bbab9f0f5524 /Lib/xml/dom/pulldom.py | |
| parent | 918f49e645474382251bfddbb0a2e030051083ef (diff) | |
| download | cpython-34d1928766bcae11d8f679a6bf361d9210b6429e.zip cpython-34d1928766bcae11d8f679a6bf361d9210b6429e.tar.gz cpython-34d1928766bcae11d8f679a6bf361d9210b6429e.tar.bz2 | |
SF patch# 1770008 by Christian Heimes (plus some extras).
Completely get rid of StringIO.py and cStringIO.c.
I had to fix a few tests and modules beyond what Christian did, and
invent a few conventions. E.g. in elementtree, I chose to
write/return Unicode strings whe no encoding is given, but bytes when
an explicit encoding is given. Also mimetools was made to always
assume binary files.
Diffstat (limited to 'Lib/xml/dom/pulldom.py')
| -rw-r--r-- | Lib/xml/dom/pulldom.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/xml/dom/pulldom.py b/Lib/xml/dom/pulldom.py index c1463c91..c15618f 100644 --- a/Lib/xml/dom/pulldom.py +++ b/Lib/xml/dom/pulldom.py @@ -335,9 +335,9 @@ def parse(stream_or_string, parser=None, bufsize=None): def parseString(string, parser=None): try: - from cStringIO import StringIO + from io import StringIO except ImportError: - from StringIO import StringIO + from io import StringIO bufsize = len(string) buf = StringIO(string) |