mirror of
https://github.com/python/cpython.git
synced 2025-10-09 08:31:26 +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
|
@ -406,7 +406,7 @@ class AbstractPickleTests(unittest.TestCase):
|
|||
# is a mystery. cPickle also suppresses PUT for objects with a refcount
|
||||
# of 1.
|
||||
def dont_test_disassembly(self):
|
||||
from cStringIO import StringIO
|
||||
from io import StringIO
|
||||
from pickletools import dis
|
||||
|
||||
for proto, expected in (0, DATA0_DIS), (1, DATA1_DIS):
|
||||
|
@ -951,8 +951,8 @@ class AbstractPickleModuleTests(unittest.TestCase):
|
|||
self.assertEqual(self.module.HIGHEST_PROTOCOL, 2)
|
||||
|
||||
def test_callapi(self):
|
||||
from cStringIO import StringIO
|
||||
f = StringIO()
|
||||
from io import BytesIO
|
||||
f = BytesIO()
|
||||
# With and without keyword arguments
|
||||
self.module.dump(123, f, -1)
|
||||
self.module.dump(123, file=f, protocol=-1)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue