mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-01 10:45:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

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

Browse source 
This is undoubtedly insufficient and in some cases just as broken as before.
This commit is contained in:
Guido van Rossum 2007-05-18 00:51:22 +00:00
parent 7ac9d40201
commit 68937b4cbc
19 changed files with 26 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Lib/urllib.py
View file

@ -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