From: Éric Araujo <merwok@netwok.org>
Date: Tue, 7 Sep 2010 23:12:59 +0000 (+0000)
Subject: Merged revisions 84611 via svnmerge from
X-Git-Tag: v2.7.1rc1~327
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5011c8d9625767a2fb16ae3376c4ff04874614f9;p=python

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 18a10a0b7f..4b3ed3f991 100644
--- a/Lib/distutils/command/upload.py
+++ b/Lib/distutils/command/upload.py
@@ -186,4 +186,5 @@ class upload(PyPIRCCommand):
             self.announce('Upload failed (%s): %s' % (status, reason),
                           log.ERROR)
         if self.show_response:
-            self.announce('-'*75, result.read(), '-'*75)
+            msg = ''.join('-' * 75, r.read(), '-' * 75)
+            self.announce(msg, log.INFO)