From: Éric Araujo <merwok@netwok.org>
Date: Wed, 8 Sep 2010 00:02:29 +0000 (+0000)
Subject: Merged revisions 84614 via svnmerge from
X-Git-Tag: v2.7.1rc1~326
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7738e4b758301a944dde31968d2befaca949ad65;p=python

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.
........
---

diff --git a/Lib/distutils/command/upload.py b/Lib/distutils/command/upload.py
index 4b3ed3f991..c3f19d207f 100644
--- a/Lib/distutils/command/upload.py
+++ b/Lib/distutils/command/upload.py
@@ -186,5 +186,5 @@ class upload(PyPIRCCommand):
             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)