[Python-checkins] r84612 - in python/branches/release31-maint: Lib/distutils/command/upload.py

[eric.araujo]

Author: eric.araujo
Date: Wed Sep  8 01:09:44 2010
New Revision: 84612

Log:
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)
........


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Lib/distutils/command/upload.py

Modified: python/branches/release31-maint/Lib/distutils/command/upload.py
==============================================================================
--- python/branches/release31-maint/Lib/distutils/command/upload.py	(original)
+++ python/branches/release31-maint/Lib/distutils/command/upload.py	Wed Sep  8 01:09:44 2010
@@ -194,4 +194,5 @@
             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)