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
|
@ -3,7 +3,7 @@ import os
|
|||
import io
|
||||
import shutil
|
||||
import tempfile
|
||||
import StringIO
|
||||
import io
|
||||
from hashlib import md5
|
||||
import errno
|
||||
|
||||
|
@ -897,15 +897,15 @@ class AppendTest(unittest.TestCase):
|
|||
self._test()
|
||||
|
||||
def test_empty_fileobj(self):
|
||||
fobj = StringIO.StringIO()
|
||||
fobj = io.BytesIO()
|
||||
self._add_testfile(fobj)
|
||||
fobj.seek(0)
|
||||
self._test(fileobj=fobj)
|
||||
|
||||
def test_fileobj(self):
|
||||
self._create_testtar()
|
||||
data = open(self.tarname).read()
|
||||
fobj = StringIO.StringIO(data)
|
||||
data = open(self.tarname, "rb").read()
|
||||
fobj = io.BytesIO(data)
|
||||
self._add_testfile(fobj)
|
||||
fobj.seek(0)
|
||||
self._test(names=["foo", "bar"], fileobj=fobj)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue