summaryrefslogtreecommitdiffstats
path: root/Lib/distutils
diff options
context:
space:
mode:
authorÉric Araujo <merwok@netwok.org>2010-09-08 00:02:29 (GMT)
committerÉric Araujo <merwok@netwok.org>2010-09-08 00:02:29 (GMT)
commit7738e4b758301a944dde31968d2befaca949ad65 (patch)
tree0101b66e9b20f3a924c3bffba8049b0d187ab723 /Lib/distutils
parent5011c8d9625767a2fb16ae3376c4ff04874614f9 (diff)
downloadcpython-7738e4b758301a944dde31968d2befaca949ad65.zip
cpython-7738e4b758301a944dde31968d2befaca949ad65.tar.gz
cpython-7738e4b758301a944dde31968d2befaca949ad65.tar.bz2
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. ........
Diffstat (limited to 'Lib/distutils')
-rw-r--r--Lib/distutils/command/upload.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/distutils/command/upload.py b/Lib/distutils/command/upload.py
index 4b3ed3f..c3f19d2 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)