diff options
| author | Guido van Rossum <guido@python.org> | 2007-08-09 01:03:29 (GMT) |
|---|---|---|
| committer | Guido van Rossum <guido@python.org> | 2007-08-09 01:03:29 (GMT) |
| commit | 34d1928766bcae11d8f679a6bf361d9210b6429e (patch) | |
| tree | 0b3d5842a690f811fa03f3b52420bbab9f0f5524 /Lib/distutils/command | |
| parent | 918f49e645474382251bfddbb0a2e030051083ef (diff) | |
| download | cpython-34d1928766bcae11d8f679a6bf361d9210b6429e.zip cpython-34d1928766bcae11d8f679a6bf361d9210b6429e.tar.gz cpython-34d1928766bcae11d8f679a6bf361d9210b6429e.tar.bz2 | |
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.
Diffstat (limited to 'Lib/distutils/command')
| -rw-r--r-- | Lib/distutils/command/register.py | 4 | ||||
| -rw-r--r-- | Lib/distutils/command/upload.py | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/Lib/distutils/command/register.py b/Lib/distutils/command/register.py index 10a903e..91081dd 100644 --- a/Lib/distutils/command/register.py +++ b/Lib/distutils/command/register.py @@ -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( () )): diff --git a/Lib/distutils/command/upload.py b/Lib/distutils/command/upload.py index d1cf87a..1ca2fb9 100644 --- a/Lib/distutils/command/upload.py +++ b/Lib/distutils/command/upload.py @@ -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([]): |