mirror of
https://github.com/python/cpython.git
synced 2025-07-24 11:44:31 +00:00
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:
parent
918f49e645
commit
34d1928766
78 changed files with 312 additions and 657 deletions
|
@ -125,7 +125,7 @@ import getopt
|
|||
import random
|
||||
import warnings
|
||||
import re
|
||||
import StringIO
|
||||
import io
|
||||
import traceback
|
||||
|
||||
# I see no other way to suppress these warnings;
|
||||
|
@ -537,7 +537,7 @@ def runtest_inner(test, generate, verbose, quiet,
|
|||
if verbose:
|
||||
cfp = None
|
||||
else:
|
||||
cfp = StringIO.StringIO() # XXX Should use io.StringIO()
|
||||
cfp = io.StringIO() # XXX Should use io.StringIO()
|
||||
|
||||
try:
|
||||
save_stdout = sys.stdout
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue