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.

Lib/email/generator.py

@@ -12,7 +12,7 @@ import time
 import random
 import warnings
 
-from cStringIO import StringIO
+from io import StringIO
 from email.header import Header
 
 UNDERSCORE = '_'

Lib/email/iterators.py

@@ -12,7 +12,7 @@ __all__ = [
     ]
 
 import sys
-from cStringIO import StringIO
+from io import StringIO
 
 
 

Lib/email/message.py

@@ -10,7 +10,7 @@ import re
 import uu
 import binascii
 import warnings
-from cStringIO import StringIO
+from io import StringIO
 
 # Intrapackage imports
 import email.charset

Lib/email/mime/audio.py

@@ -8,7 +8,7 @@ __all__ = ['MIMEAudio']
 
 import sndhdr
 
-from cStringIO import StringIO
+from io import StringIO
 from email import encoders
 from email.mime.nonmultipart import MIMENonMultipart
 

Lib/email/parser.py

@@ -7,7 +7,7 @@
 __all__ = ['Parser', 'HeaderParser']
 
 import warnings
-from cStringIO import StringIO
+from io import StringIO
 
 from email.feedparser import FeedParser
 from email.message import Message

Lib/email/test/test_email.py

@@ -9,7 +9,7 @@ import base64
 import difflib
 import unittest
 import warnings
-from cStringIO import StringIO
+from io import StringIO
 
 import email
 

Lib/email/test/test_email_renamed.py

@@ -9,7 +9,7 @@ import base64
 import difflib
 import unittest
 import warnings
-from cStringIO import StringIO
+from io import StringIO
 
 import email
 

Lib/email/test/test_email_torture.py

@@ -9,7 +9,7 @@
 import sys
 import os
 import unittest
-from cStringIO import StringIO
+from io import StringIO
 from types import ListType
 
 from email.test.test_email import TestEmailBase

Lib/email/utils.py

@@ -27,7 +27,7 @@ import random
 import socket
 import urllib
 import warnings
-from cStringIO import StringIO
+from io import StringIO
 
 from email._parseaddr import quote
 from email._parseaddr import AddressList as _AddressList