mirror of
https://github.com/python/cpython.git
synced 2025-11-02 03:01:58 +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
|
|
@ -153,8 +153,8 @@ class HeaderTests(TestCase):
|
|||
try:
|
||||
result = split_header_words([arg])
|
||||
except:
|
||||
import traceback, StringIO
|
||||
f = StringIO.StringIO()
|
||||
import traceback, io
|
||||
f = io.StringIO()
|
||||
traceback.print_exc(None, f)
|
||||
result = "(error -- traceback follows)\n\n%s" % f.getvalue()
|
||||
self.assertEquals(result, expect, """
|
||||
|
|
@ -204,8 +204,8 @@ class FakeResponse:
|
|||
"""
|
||||
headers: list of RFC822-style 'Key: value' strings
|
||||
"""
|
||||
import mimetools, StringIO
|
||||
f = StringIO.StringIO("\n".join(headers))
|
||||
import mimetools, io
|
||||
f = io.StringIO("\n".join(headers))
|
||||
self._headers = mimetools.Message(f)
|
||||
self._url = url
|
||||
def info(self): return self._headers
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue