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.
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 httplib
import base64
import urlparse
-import cStringIO as StringIO
class upload(Command):
@@ -135,7 +134,7 @@
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([]):