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.

2 files changed, 4 insertions, 4 deletions

diff --git a/Tools/framer/example.py b/Tools/framer/example.py
index 96f6278..8a267e9 100644
--- a/Tools/framer/example.py
+++ b/Tools/framer/example.py
@@ -14,7 +14,7 @@ class cStringIO(Module):
 
     Usage:
 
-    from cStringIO import StringIO
+    from io import StringIO
 
     an_output_stream = StringIO()
     an_output_stream.write(some_stuff)
diff --git a/Tools/webchecker/webchecker.py b/Tools/webchecker/webchecker.py
index a172fd9..5b97851 100755
--- a/Tools/webchecker/webchecker.py
+++ b/Tools/webchecker/webchecker.py
@@ -109,7 +109,7 @@ __version__ = "$Revision$"
 import sys
 import os
 from types import *
-import StringIO
+import io
 import getopt
 import pickle
 
@@ -721,12 +721,12 @@ class Page:
         return infos
 
 
-class MyStringIO(StringIO.StringIO):
+class MyStringIO(io.StringIO):
 
     def __init__(self, url, info):
         self.__url = url
         self.__info = info
-        StringIO.StringIO.__init__(self)
+        super(MyStringIO, self).__init__(self)
 
     def info(self):
         return self.__info