aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2013-09-03 22:46:55 -0400
committerJason R. Coombs <jaraco@jaraco.com>2013-09-03 22:46:55 -0400
commitca3e8a370652c0735cb3921d43152e1014bbd946 (patch)
treea6cd3f3f6b893dbfc3f4eaae1a94e0932bfedba3
parentaa3e70d8a887dc71ecc8170d04a623fa5542360f (diff)
downloadexternal_python_setuptools-ca3e8a370652c0735cb3921d43152e1014bbd946.tar.gz
external_python_setuptools-ca3e8a370652c0735cb3921d43152e1014bbd946.tar.bz2
external_python_setuptools-ca3e8a370652c0735cb3921d43152e1014bbd946.zip
Correct AttributeError in upload command on Python 2.4. Fixes #76
-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):