aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGES.txt7
-rwxr-xr-xsetuptools/command/upload.py2
2 files changed, 5 insertions, 4 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index 5a739571..b0d0da3e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,12 +2,13 @@
CHANGES
=======
-----
-next
-----
+-----
+1.1.1
+-----
* Issue #75: Add ``--insecure`` option to ez_setup.py to accommodate
environments where a trusted SSL connection cannot be validated.
+* Issue #76: Fix AttributeError in upload command with Python 2.4.
---
1.1
diff --git a/setuptools/command/upload.py b/setuptools/command/upload.py
index dde4decd..5476b5ec 100755
--- a/setuptools/command/upload.py
+++ b/setuptools/command/upload.py
@@ -119,7 +119,7 @@ class upload(Command):
boundary = '--------------GHSKFJDLGDS7543FJKLFHRE75642756743254'
sep_boundary = '\n--' + boundary
end_boundary = sep_boundary + '--'
- body = StringIO.StringIO()
+ body = StringIO()
for key, value in data.items():
# handle multiple entries for the same name
if isinstance(value, list):