summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2013-11-16 01:08:22 (GMT)
committerJason R. Coombs <jaraco@jaraco.com>2013-11-16 01:08:22 (GMT)
commit91bf058c9890ce2559bcfeabcea16e94fd3763c9 (patch)
tree66d142e48013b1e39d52e92db2840cbeeeec8abb
parent6afafc7ea4b0f73cf99fe16936a65b83d3e7ebb4 (diff)
downloadcpython-91bf058c9890ce2559bcfeabcea16e94fd3763c9.zip
cpython-91bf058c9890ce2559bcfeabcea16e94fd3763c9.tar.gz
cpython-91bf058c9890ce2559bcfeabcea16e94fd3763c9.tar.bz2
Issue #12853: Correct NameError in distutils upload command.
-rw-r--r--Lib/distutils/command/upload.py2
-rw-r--r--Misc/NEWS2
2 files changed, 3 insertions, 1 deletions
diff --git a/Lib/distutils/command/upload.py b/Lib/distutils/command/upload.py
index d013335..c43607f 100644
--- a/Lib/distutils/command/upload.py
+++ b/Lib/distutils/command/upload.py
@@ -177,7 +177,7 @@ class upload(PyPIRCCommand):
status = result.getcode()
reason = result.msg
if self.show_response:
- msg = '\n'.join(('-' * 75, r.read(), '-' * 75))
+ msg = '\n'.join(('-' * 75, result.read(), '-' * 75))
self.announce(msg, log.INFO)
except socket.error, e:
self.announce(str(e), log.ERROR)
diff --git a/Misc/NEWS b/Misc/NEWS
index 2638fc7..77bc5a8 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,8 @@ Core and Builtins
Library
-------
+- Issue #12853: Fix NameError in distutils.command.upload.
+
- Issue #19523: Closed FileHandler leak which occurred when delay was set.
- Issue #1575020: Fixed support of 24-bit wave files on big-endian platforms.