mirror of
https://github.com/python/cpython.git
synced 2025-07-24 11:44:31 +00:00
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.
This commit is contained in:
parent
918f49e645
commit
34d1928766
78 changed files with 312 additions and 657 deletions
|
@ -8,7 +8,7 @@ Implements the Distutils 'register' command (register with the repository).
|
|||
__revision__ = "$Id$"
|
||||
|
||||
import sys, os, urllib2, getpass, urlparse
|
||||
import StringIO, ConfigParser
|
||||
import io, ConfigParser
|
||||
|
||||
from distutils.core import Command
|
||||
from distutils.errors import *
|
||||
|
@ -253,7 +253,7 @@ Your selection [default 1]: ''', end=' ')
|
|||
boundary = '--------------GHSKFJDLGDS7543FJKLFHRE75642756743254'
|
||||
sep_boundary = '\n--' + boundary
|
||||
end_boundary = sep_boundary + '--'
|
||||
body = StringIO.StringIO()
|
||||
body = io.StringIO()
|
||||
for key, value in data.items():
|
||||
# handle multiple entries for the same name
|
||||
if type(value) not in (type([]), type( () )):
|
||||
|
|
|
@ -14,7 +14,6 @@ import ConfigParser
|
|||
import httplib
|
||||
import base64
|
||||
import urlparse
|
||||
import cStringIO as StringIO
|
||||
|
||||
class upload(Command):
|
||||
|
||||
|
@ -135,7 +134,7 @@ class upload(Command):
|
|||
boundary = '--------------GHSKFJDLGDS7543FJKLFHRE75642756743254'
|
||||
sep_boundary = '\n--' + boundary
|
||||
end_boundary = sep_boundary + '--'
|
||||
body = StringIO.StringIO()
|
||||
body = io.StringIO()
|
||||
for key, value in data.items():
|
||||
# handle multiple entries for the same name
|
||||
if type(value) != type([]):
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue