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

Wed Sep 8 01:12:59 CEST 2010

Author: eric.araujo
Date: Wed Sep 8 01:12:59 2010
New Revision: 84613
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/release27-maint/ (props changed)
 python/branches/release27-maint/Lib/distutils/command/upload.py
Modified: python/branches/release27-maint/Lib/distutils/command/upload.py
==============================================================================

--- python/branches/release27-maint/Lib/distutils/command/upload.py	(original)
+++ python/branches/release27-maint/Lib/distutils/command/upload.py	Wed Sep 8 01:12:59 2010
@@ -186,4 +186,5 @@
 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)
