mirror of
https://github.com/python/cpython.git
synced 2025-08-31 14:07:50 +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
|
@ -15,7 +15,7 @@ import zipimport
|
|||
import linecache
|
||||
import doctest
|
||||
import inspect
|
||||
import StringIO
|
||||
import io
|
||||
from traceback import extract_tb, extract_stack, print_tb
|
||||
raise_src = 'def do_raise(): raise TypeError\n'
|
||||
|
||||
|
@ -314,7 +314,7 @@ class UncompressedZipImportTestCase(ImportHooksBaseTestCase):
|
|||
f,lno,n,line = extract_stack(tb.tb_frame, 1)[0]
|
||||
self.assertEqual(line, raise_src.strip())
|
||||
|
||||
s = StringIO.StringIO()
|
||||
s = io.StringIO()
|
||||
print_tb(tb, 1, s)
|
||||
self.failUnless(s.getvalue().endswith(raise_src))
|
||||
else:
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue