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 18a10a0b7fb303beee69e0aa2afc168ab7647b19..4b3ed3f991d16a17ceb2f8be29f01df94af686e7 100644 (file)
--- 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)