summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉric Araujo <merwok@netwok.org>2010-09-07 23:12:59 +0000
committerÉric Araujo <merwok@netwok.org>2010-09-07 23:12:59 +0000
commit5011c8d9625767a2fb16ae3376c4ff04874614f9 (patch)
treed991673efcbe1141cfcaf3811285183cfc0e6fe9
parentb55feda06c0860e0b216ac3a5fadf34031afc491 (diff)
downloadcpython-git-5011c8d9625767a2fb16ae3376c4ff04874614f9.tar.gz
Merged revisions 84611 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r84611 | eric.araujo | 2010-09-08 01:08:57 +0200 (mer., 08 sept. 2010) | 2 lines Fix incorrect use of Command.announce (#9199) ........
-rw-r--r--Lib/distutils/command/upload.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/Lib/distutils/command/upload.py b/Lib/distutils/command/upload.py
index 18a10a0b7f..4b3ed3f991 100644
--- a/Lib/distutils/command/upload.py
+++ b/Lib/distutils/command/upload.py
@@ -186,4 +186,5 @@ class upload(PyPIRCCommand):
self.announce('Upload failed (%s): %s' % (status, reason),
log.ERROR)
if self.show_response:
- self.announce('-'*75, result.read(), '-'*75)
+ msg = ''.join('-' * 75, r.read(), '-' * 75)
+ self.announce(msg, log.INFO)