mirror of
https://github.com/python/cpython.git
synced 2025-11-01 02:38:53 +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
|
|
@ -1,13 +1,13 @@
|
|||
# -*- coding: iso-8859-1 -*-
|
||||
import unittest, test.test_support
|
||||
import sys, cStringIO
|
||||
import sys, io
|
||||
|
||||
class SysModuleTest(unittest.TestCase):
|
||||
|
||||
def test_original_displayhook(self):
|
||||
import __builtin__
|
||||
savestdout = sys.stdout
|
||||
out = cStringIO.StringIO()
|
||||
out = io.StringIO()
|
||||
sys.stdout = out
|
||||
|
||||
dh = sys.__displayhook__
|
||||
|
|
@ -46,7 +46,7 @@ class SysModuleTest(unittest.TestCase):
|
|||
|
||||
def test_original_excepthook(self):
|
||||
savestderr = sys.stderr
|
||||
err = cStringIO.StringIO()
|
||||
err = io.StringIO()
|
||||
sys.stderr = err
|
||||
|
||||
eh = sys.__excepthook__
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue