Change some uses of cStringIO.StringIO to io.StringIO.

This is undoubtedly insufficient and in some cases just as broken as before.

diff --git a/Lib/SimpleHTTPServer.py b/Lib/SimpleHTTPServer.py
index 86c669ea409ed07b979a46bb75e39c6769136f02..a1f25be6fccb382bd79edf8a04bbadbebf6d0bc4 100644 (file)
--- a/Lib/SimpleHTTPServer.py
+++ b/Lib/SimpleHTTPServer.py
@@ -18,10 +18,7 @@ import urlparse
 import cgi
 import shutil
 import mimetypes
-try:
-    from cStringIO import StringIO
-except ImportError:
-    from StringIO import StringIO
+from io import StringIO
 
 
 class SimpleHTTPRequestHandler(BaseHTTPServer.BaseHTTPRequestHandler):

diff --git a/Lib/SocketServer.py b/Lib/SocketServer.py
index 84bbcf641356a55cdcd86f33dc3ccb085dab40af..8e92b800979073a9b891985ba68d979a94031ff4 100644 (file)
--- a/Lib/SocketServer.py
+++ b/Lib/SocketServer.py
@@ -577,10 +577,7 @@ class DatagramRequestHandler(BaseRequestHandler):
     """Define self.rfile and self.wfile for datagram sockets."""
 
     def setup(self):
-        try:
-            from cStringIO import StringIO
-        except ImportError:
-            from StringIO import StringIO
+        from io import StringIO
         self.packet, self.socket = self.request
         self.rfile = StringIO(self.packet)
         self.wfile = StringIO()

diff --git a/Lib/cgi.py b/Lib/cgi.py
index 5ddf16e8f8819dea68edb26d621ae56753fdac29..f756330fc9392eeb88d7dda8ab3b44a84c5f1837 100755 (executable)
--- a/Lib/cgi.py
+++ b/Lib/cgi.py
@@ -41,10 +41,7 @@ import urllib
 import mimetools
 import rfc822
 import UserDict
-try:
-    from cStringIO import StringIO
-except ImportError:
-    from StringIO import StringIO
+from io import StringIO
 
 __all__ = ["MiniFieldStorage", "FieldStorage", "FormContentDict",
            "SvFormContentDict", "InterpFormContentDict", "FormContent",

diff --git a/Lib/csv.py b/Lib/csv.py
index 6ee12c8b0fb0ec6749e4be3b198f318346908f4d..758c79a4d88bc00129d142320cb4318a6197d663 100644 (file)
--- a/Lib/csv.py
+++ b/Lib/csv.py
@@ -11,10 +11,7 @@ from _csv import Error, __version__, writer, reader, register_dialect, \
                  __doc__
 from _csv import Dialect as _Dialect
 
-try:
-    from cStringIO import StringIO
-except ImportError:
-    from StringIO import StringIO
+from io import StringIO
 
 __all__ = [ "QUOTE_MINIMAL", "QUOTE_ALL", "QUOTE_NONNUMERIC", "QUOTE_NONE",
             "Error", "Dialect", "excel", "excel_tab", "reader", "writer",

diff --git a/Lib/gettext.py b/Lib/gettext.py
index 311e923861d0f685d623fac0620b641be209b744..a23c2acf007a722e3592a22131c9966bc808e8d2 100644 (file)
--- a/Lib/gettext.py
+++ b/Lib/gettext.py
@@ -77,10 +77,7 @@ def c2py(plural):
     Python lambda function that implements an equivalent expression.
     """
     # Security check, allow only the "n" identifier
-    try:
-        from cStringIO import StringIO
-    except ImportError:
-        from StringIO import StringIO
+    from io import StringIO
     import token, tokenize
     tokens = tokenize.generate_tokens(StringIO(plural).readline)
     try:

diff --git a/Lib/httplib.py b/Lib/httplib.py
index 84401acc65b86f43bd3dcd2bc660bf9fbb93bff4..4c23983a81742b81290b4bdb33d03e89459a9a0a 100644 (file)
--- a/Lib/httplib.py
+++ b/Lib/httplib.py
@@ -71,10 +71,7 @@ import mimetools
 import socket
 from urlparse import urlsplit
 
-try:
-    from cStringIO import StringIO
-except ImportError:
-    from StringIO import StringIO
+from io import StringIO
 
 __all__ = ["HTTP", "HTTPResponse", "HTTPConnection", "HTTPSConnection",
            "HTTPException", "NotConnected", "UnknownProtocol",

diff --git a/Lib/mhlib.py b/Lib/mhlib.py
index cbe8cb1dd617104ca5c48d1cfdffa6e87a2cbd72..eecb447a131abc97709b9ff100a9f6ea9f904511 100644 (file)
--- a/Lib/mhlib.py
+++ b/Lib/mhlib.py
@@ -697,10 +697,7 @@ class Message(mimetools.Message):
         encoding = self.getencoding()
         if not decode or encoding in ('', '7bit', '8bit', 'binary'):
             return self.fp.read()
-        try:
-            from cStringIO import StringIO
-        except ImportError:
-            from StringIO import StringIO
+        from io import StringIO
         output = StringIO()
         mimetools.decode(self.fp, output, encoding)
         return output.getvalue()

diff --git a/Lib/quopri.py b/Lib/quopri.py
index fccfe85b9f07888b1e596bcee018121b161b98d2..5002cc85e933d92a5ac0dd167db334fb2e96b5d8 100755 (executable)
--- a/Lib/quopri.py
+++ b/Lib/quopri.py
@@ -105,7 +105,7 @@ def encode(input, output, quotetabs, header = 0):
 def encodestring(s, quotetabs = 0, header = 0):
     if b2a_qp is not None:
         return b2a_qp(s, quotetabs = quotetabs, header = header)
-    from cStringIO import StringIO
+    from io import StringIO
     infp = StringIO(s)
     outfp = StringIO()
     encode(infp, outfp, quotetabs, header)
@@ -159,7 +159,7 @@ def decode(input, output, header = 0):
 def decodestring(s, header = 0):
     if a2b_qp is not None:
         return a2b_qp(s, header = header)
-    from cStringIO import StringIO
+    from io import StringIO
     infp = StringIO(s)
     outfp = StringIO()
     decode(infp, outfp, header = header)

diff --git a/Lib/shelve.py b/Lib/shelve.py
index 697ae4f0f9f955f62fd306abd2e674b110cef90b..5aa8263f05883f7484d56a5f7d23ccc305a0e4cb 100644 (file)
--- a/Lib/shelve.py
+++ b/Lib/shelve.py
@@ -56,17 +56,8 @@ entries in the cache, and empty the cache (d.sync() also synchronizes
 the persistent dictionary on disk, if feasible).
 """
 
-# Try using cPickle and cStringIO if available.
-
-try:
-    from cPickle import Pickler, Unpickler
-except ImportError:
-    from pickle import Pickler, Unpickler
-
-try:
-    from cStringIO import StringIO
-except ImportError:
-    from StringIO import StringIO
+from pickle import Pickler, Unpickler
+from io import StringIO
 
 import UserDict
 import warnings

diff --git a/Lib/shlex.py b/Lib/shlex.py
index 520b637bcb79954924389ca66805b719dba0afb8..964046dbd55b2f6e7a93f59e289321d71425ec9c 100644 (file)
--- a/Lib/shlex.py
+++ b/Lib/shlex.py
@@ -11,10 +11,7 @@ import os.path
 import sys
 from collections import deque
 
-try:
-    from cStringIO import StringIO
-except ImportError:
-    from StringIO import StringIO
+from io import StringIO
 
 __all__ = ["shlex", "split"]
 

diff --git a/Lib/smtpd.py b/Lib/smtpd.py
index 73e7777fa001b98407ebb40bbfb140223fb365d8..2e09c5ad992c2f38d6c45b3de52a30b965762f0f 100755 (executable)
--- a/Lib/smtpd.py
+++ b/Lib/smtpd.py
@@ -374,7 +374,7 @@ class PureProxy(SMTPServer):
 \f
 class MailmanProxy(PureProxy):
     def process_message(self, peer, mailfrom, rcpttos, data):
-        from cStringIO import StringIO
+        from io import StringIO
         from Mailman import Utils
         from Mailman import Message
         from Mailman import MailList

diff --git a/Lib/tarfile.py b/Lib/tarfile.py
index 36bdfa6ce075b362e89ac6b2bba7598e76a54e6b..ad1473f6dfe8d8168c043811fac63b9bce2081f3 100644 (file)
--- a/Lib/tarfile.py
+++ b/Lib/tarfile.py
@@ -2459,10 +2459,7 @@ class TarFileCompat:
     def write(self, filename, arcname=None, compress_type=None):
         self.tarfile.add(filename, arcname)
     def writestr(self, zinfo, bytes):
-        try:
-            from cStringIO import StringIO
-        except ImportError:
-            from StringIO import StringIO
+        from io import StringIO
         import calendar
         zinfo.name = zinfo.filename
         zinfo.size = zinfo.file_size

diff --git a/Lib/tempfile.py b/Lib/tempfile.py
index bcd91893b5f906ef5c2ef522135a59b48c1fd1e5..0dd32f3bff9ac1c567060a3542a9139cfda29bef 100644 (file)
--- a/Lib/tempfile.py
+++ b/Lib/tempfile.py
@@ -37,10 +37,7 @@ if _os.name == 'mac':
     import Carbon.Folder as _Folder
     import Carbon.Folders as _Folders
 
-try:
-    from cStringIO import StringIO as _StringIO
-except:
-    from StringIO import StringIO as _StringIO
+from io import StringIO as _StringIO
 
 try:
     import fcntl as _fcntl

diff --git a/Lib/urllib.py b/Lib/urllib.py
index cc5ee0701190b12f7fda612b949e2186eca54abb..cffa02673d55e72ff27dd569ca178acf914689c1 100644 (file)
--- a/Lib/urllib.py
+++ b/Lib/urllib.py
@@ -462,10 +462,7 @@ class URLopener:
     def open_local_file(self, url):
         """Use local file."""
         import mimetypes, mimetools, email.utils
-        try:
-            from cStringIO import StringIO
-        except ImportError:
-            from StringIO import StringIO
+        from io import StringIO
         host, file = splithost(url)
         localname = url2pathname(file)
         try:
@@ -499,10 +496,7 @@ class URLopener:
         if not isinstance(url, str):
             raise IOError, ('ftp error', 'proxy support for ftp protocol currently not implemented')
         import mimetypes, mimetools
-        try:
-            from cStringIO import StringIO
-        except ImportError:
-            from StringIO import StringIO
+        from io import StringIO
         host, path = splithost(url)
         if not host: raise IOError, ('ftp error', 'no host given')
         host, port = splitport(host)
@@ -568,10 +562,7 @@ class URLopener:
         # data      := *urlchar
         # parameter := attribute "=" value
         import mimetools
-        try:
-            from cStringIO import StringIO
-        except ImportError:
-            from StringIO import StringIO
+        from io import StringIO
         try:
             [type, data] = url.split(',', 1)
         except ValueError:
@@ -821,10 +812,7 @@ def noheaders():
     global _noheaders
     if _noheaders is None:
         import mimetools
-        try:
-            from cStringIO import StringIO
-        except ImportError:
-            from StringIO import StringIO
+        from io import StringIO
         _noheaders = mimetools.Message(StringIO(), 0)
         _noheaders.fp.close()   # Recycle file descriptor
     return _noheaders

diff --git a/Lib/urllib2.py b/Lib/urllib2.py
index a0be039c44f8775705484607cbb913c61999d82b..284c921247abb354efad7616202caa0b678b9d4d 100644 (file)
--- a/Lib/urllib2.py
+++ b/Lib/urllib2.py
@@ -101,10 +101,7 @@ import time
 import urlparse
 import bisect
 
-try:
-    from cStringIO import StringIO
-except ImportError:
-    from StringIO import StringIO
+from io import StringIO
 
 from urllib import (unwrap, unquote, splittype, splithost, quote,
      addinfourl, splitport, splitgophertype, splitquery,

diff --git a/Lib/urlparse.py b/Lib/urlparse.py
index 8cc7a97ad4b44d2721615b1093b200036f93fc75..e5de53ae8a0cbf62bf580afeebd99406706dc2eb 100644 (file)
--- a/Lib/urlparse.py
+++ b/Lib/urlparse.py
@@ -350,10 +350,7 @@ def test():
         else:
             fp = open(fn)
     else:
-        try:
-            from cStringIO import StringIO
-        except ImportError:
-            from StringIO import StringIO
+        from io import StringIO
         fp = StringIO(test_input)
     while 1:
         line = fp.readline()

diff --git a/Lib/xdrlib.py b/Lib/xdrlib.py
index 2f5db9baedd261347dda0334457a1422002a6250..055ee82bff8890d3f3d595801f18f4b9810b235f 100644 (file)
--- a/Lib/xdrlib.py
+++ b/Lib/xdrlib.py
@@ -5,10 +5,7 @@ See: RFC 1014
 """
 
 import struct
-try:
-    from cStringIO import StringIO as _StringIO
-except ImportError:
-    from StringIO import StringIO as _StringIO
+from io import StringIO as _StringIO
 
 __all__ = ["Error", "Packer", "Unpacker", "ConversionError"]
 

diff --git a/Lib/xmlrpclib.py b/Lib/xmlrpclib.py
index 3347e54c379d03c3a8198fca87800c47b75470de..9684ab05d5908195dd4200df03717d4e6801a3b4 100644 (file)
--- a/Lib/xmlrpclib.py
+++ b/Lib/xmlrpclib.py
@@ -370,10 +370,7 @@ def _datetime_type(data):
 # @param data An 8-bit string containing arbitrary data.
 
 import base64
-try:
-    import cStringIO as StringIO
-except ImportError:
-    import StringIO
+import io
 
 class Binary:
     """Wrapper for binary data."""
@@ -404,7 +401,7 @@ class Binary:
 
     def encode(self, out):
         out.write("<value><base64>\n")
-        base64.encode(StringIO.StringIO(self.data), out)
+        base64.encode(io.StringIO(self.data), out)
         out.write("</base64></value>\n")
 
 def _binary(data):

diff --git a/Lib/zipfile.py b/Lib/zipfile.py
index fa7e910e7df1c7189039cf12f288c3e4eced871f..1e180fc07b74afcdfec849b8dd9523d53e43a85d 100644 (file)
--- a/Lib/zipfile.py
+++ b/Lib/zipfile.py
@@ -2,7 +2,7 @@
 Read and write ZIP files.
 """
 import struct, os, time, sys
-import binascii, cStringIO
+import binascii, io
 
 try:
     import zlib # We may need its compression method
@@ -661,7 +661,7 @@ class ZipFile:
         self.start_dir = offset_cd + concat
         fp.seek(self.start_dir, 0)
         data = fp.read(size_cd)
-        fp = cStringIO.StringIO(data)
+        fp = io.StringIO(data)
         total = 0
         while total < size_cd:
             centdir = fp.read(46)