mirror of
https://github.com/python/cpython.git
synced 2025-08-03 16:39:00 +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 @@ from test import test_support
|
|||
from test.test_support import TESTFN
|
||||
|
||||
import unittest
|
||||
from cStringIO import StringIO
|
||||
from io import BytesIO
|
||||
import os
|
||||
import subprocess
|
||||
import sys
|
||||
|
@ -98,7 +98,7 @@ class BZ2FileTest(BaseTest):
|
|||
self.createTempFile()
|
||||
bz2f = BZ2File(self.filename)
|
||||
self.assertRaises(TypeError, bz2f.readline, None)
|
||||
sio = StringIO(self.TEXT)
|
||||
sio = BytesIO(self.TEXT)
|
||||
for line in sio.readlines():
|
||||
self.assertEqual(bz2f.readline(), line)
|
||||
bz2f.close()
|
||||
|
@ -108,7 +108,7 @@ class BZ2FileTest(BaseTest):
|
|||
self.createTempFile()
|
||||
bz2f = BZ2File(self.filename)
|
||||
self.assertRaises(TypeError, bz2f.readlines, None)
|
||||
sio = StringIO(self.TEXT)
|
||||
sio = BytesIO(self.TEXT)
|
||||
self.assertEqual(bz2f.readlines(), sio.readlines())
|
||||
bz2f.close()
|
||||
|
||||
|
@ -116,7 +116,7 @@ class BZ2FileTest(BaseTest):
|
|||
# "Test iter(BZ2File)"
|
||||
self.createTempFile()
|
||||
bz2f = BZ2File(self.filename)
|
||||
sio = StringIO(self.TEXT)
|
||||
sio = BytesIO(self.TEXT)
|
||||
self.assertEqual(list(iter(bz2f)), sio.readlines())
|
||||
bz2f.close()
|
||||
|
||||
|
@ -149,7 +149,7 @@ class BZ2FileTest(BaseTest):
|
|||
# "Test BZ2File.writelines()"
|
||||
bz2f = BZ2File(self.filename, "w")
|
||||
self.assertRaises(TypeError, bz2f.writelines)
|
||||
sio = StringIO(self.TEXT)
|
||||
sio = BytesIO(self.TEXT)
|
||||
bz2f.writelines(sio.readlines())
|
||||
bz2f.close()
|
||||
# patch #1535500
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue