summaryrefslogtreecommitdiffstats
path: root/Lib/distutils/command
diff options
context:
space:
mode:
authorÉric Araujo <merwok@netwok.org>2010-09-08 00:02:00 (GMT)
committerÉric Araujo <merwok@netwok.org>2010-09-08 00:02:00 (GMT)
commit5c46b14b30e9d58f7f4f29056fed9bbaf0b85c6d (patch)
treedd6af0160b67118201275ff016b29c08058da2f9 /Lib/distutils/command
parenta7851ca09db21a974be0e6b1ab33dfa934f9d86a (diff)
downloadcpython-5c46b14b30e9d58f7f4f29056fed9bbaf0b85c6d.zip
cpython-5c46b14b30e9d58f7f4f29056fed9bbaf0b85c6d.tar.gz
cpython-5c46b14b30e9d58f7f4f29056fed9bbaf0b85c6d.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/command')
-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 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)