summaryrefslogtreecommitdiff
path: root/Lib/distutils
diff options
context:
space:
mode:
authorÉric Araujo <merwok@netwok.org>2010-09-08 00:02:00 +0000
committerÉric Araujo <merwok@netwok.org>2010-09-08 00:02:00 +0000
commitbb9ecdac09762ec41bddbeac9d17eaa65449b107 (patch)
tree494b85bde36c0099fbaf146b3100ef3b4a9a40ae /Lib/distutils
parent5430281e7afbcc0d5185ccafc723b4093c236f42 (diff)
downloadcpython-bb9ecdac09762ec41bddbeac9d17eaa65449b107.tar.gz
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 41df127799..99e03d747c 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)