Merge

CHANGES.txt

@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+-----
+1.1.4
+-----
+
+* Issue #77: Fix error in upload command (Python 2.4).
+
 -----
 1.1.3
 -----

setuptools/command/upload.py

@@ -122,7 +122,7 @@ class upload(Command):
         body = StringIO()
         for key, value in data.items():
             # handle multiple entries for the same name
-            if isinstance(value, list):
+            if not isinstance(value, list):
                 value = [value]
             for value in value:
                 if type(value) is tuple: