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.
This commit is contained in:
Guido van Rossum 2007-08-09 01:03:29 +00:00
parent 918f49e645
commit 34d1928766
78 changed files with 312 additions and 657 deletions

View file

@ -19,7 +19,7 @@ isn't part of a group of similar items is not modified.
__version__ = '$Revision$'
import re
import StringIO
import io
import sys
@ -50,7 +50,7 @@ def process(ifn, ofn=None):
ifp = open(ifn)
if ofn is None:
ofn = ifn
ofp = StringIO.StringIO()
ofp = io.StringIO()
entries = []
match = breakable_re.match
write = ofp.write

View file

@ -1055,8 +1055,8 @@ def main():
ofp = sys.stdout
elif len(sys.argv) == 3:
ifp = open(sys.argv[1])
import StringIO
ofp = StringIO.StringIO()
import io
ofp = io.StringIO()
else:
usage()
sys.exit(2)