From 5c46b14b30e9d58f7f4f29056fed9bbaf0b85c6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Araujo?= Date: Wed, 8 Sep 2010 00:02:00 +0000 Subject: 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. ........ --- Lib/distutils/command/upload.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lib/distutils/command/upload.py b/Lib/distutils/command/upload.py index 41df127..99e03d7 100644 --- a/Lib/distutils/command/upload.py +++ b/Lib/distutils/command/upload.py @@ -194,5 +194,5 @@ class upload(PyPIRCCommand): self.announce('Upload failed (%s): %s' % (r.status, r.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) -- cgit v0.12