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

[eric.araujo]

Author: eric.araujo
Date: Wed Sep  8 02:02:29 2010
New Revision: 84616

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

........
  r84614 | eric.araujo | 2010-09-08 02:00:45 +0200 (mer., 08 sept. 2010) | 5 lines
  
  Follow-up to #9199: Fix str.join use, add newlines.
  
  Thanks to Konrad Delong for writing a test for upload_docs
  --show-response in distutils2, letting me catch my mistake.
........


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 02:02:29 2010
@@ -186,5 +186,5 @@
             self.announce('Upload failed (%s): %s' % (status, reason),
                           log.ERROR)
         if self.show_response:
-            msg = ''.join('-' * 75, r.read(), '-' * 75)
+            msg = '\n'.join(('-' * 75, r.read(), '-' * 75))
             self.announce(msg, log.INFO)