From: Éric Araujo <merwok@netwok.org>
Date: Tue, 7 Sep 2010 23:09:44 +0000 (+0000)
Subject: Merged revisions 84611 via svnmerge from
X-Git-Tag: v3.1.3rc1~265
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a7851ca09db21a974be0e6b1ab33dfa934f9d86a;p=thirdparty%2FPython%2Fcpython.git

Merged revisions 84611 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r84611 | eric.araujo | 2010-09-08 01:08:57 +0200 (mer., 08 sept. 2010) | 2 lines

  Fix incorrect use of Command.announce (#9199)
........
---

diff --git a/Lib/distutils/command/upload.py b/Lib/distutils/command/upload.py
index f602fbeb6869..41df12779955 100644
--- a/Lib/distutils/command/upload.py
+++ b/Lib/distutils/command/upload.py
@@ -194,4 +194,5 @@ class upload(PyPIRCCommand):
             self.announce('Upload failed (%s): %s' % (r.status, r.reason),
                           log.ERROR)
         if self.show_response:
-            self.announce('-'*75, r.read(), '-'*75)
+            msg = ''.join('-' * 75, r.read(), '-' * 75)
+            self.announce(msg, log.INFO)