mirror of
https://github.com/python/cpython.git
synced 2025-08-30 21:48:47 +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
|
@ -25,7 +25,7 @@ Copyright (C) 2001-2002 Vinay Sajip. All Rights Reserved.
|
|||
"""
|
||||
|
||||
import select
|
||||
import os, sys, struct, pickle, cStringIO
|
||||
import os, sys, struct, pickle, io
|
||||
import socket, tempfile, threading, time
|
||||
import logging, logging.handlers, logging.config
|
||||
from test.test_support import run_with_locale
|
||||
|
@ -606,7 +606,7 @@ def test_main_inner():
|
|||
#Configure the logger for logrecv so events do not propagate beyond it.
|
||||
#The sockLogger output is buffered in memory until the end of the test,
|
||||
#and printed at the end.
|
||||
sockOut = cStringIO.StringIO()
|
||||
sockOut = io.StringIO()
|
||||
sockLogger = logging.getLogger("logrecv")
|
||||
sockLogger.setLevel(logging.DEBUG)
|
||||
sockhdlr = logging.StreamHandler(sockOut)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue