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.
diff --git a/Lib/test/test_cfgparser.py b/Lib/test/test_cfgparser.py
index 076de4a..8822735 100644
--- a/Lib/test/test_cfgparser.py
+++ b/Lib/test/test_cfgparser.py
@@ -1,5 +1,5 @@
import ConfigParser
-import StringIO
+import io
import unittest
import UserDict
@@ -30,7 +30,7 @@
def fromstring(self, string, defaults=None):
cf = self.newconfig(defaults)
- sio = StringIO.StringIO(string)
+ sio = io.StringIO(string)
cf.readfp(sio)
return cf
@@ -156,7 +156,7 @@
"No Section!\n")
def parse_error(self, exc, src):
- sio = StringIO.StringIO(src)
+ sio = io.StringIO(src)
self.assertRaises(exc, self.cf.readfp, sio)
def test_query_errors(self):
@@ -222,7 +222,7 @@
"foo: another very\n"
" long line"
)
- output = StringIO.StringIO()
+ output = io.StringIO()
cf.write(output)
self.assertEqual(
output.getvalue(),
@@ -449,7 +449,7 @@
"o1=4\n"
"[a]\n"
"k=v\n")
- output = StringIO.StringIO()
+ output = io.StringIO()
self.cf.write(output)
self.assertEquals(output.getvalue(),
"[a]\n"