From: Jason R. Coombs <jaraco@jaraco.com>
Date: Sat, 16 Nov 2013 01:08:22 +0000 (-0500)
Subject: Issue #12853: Correct NameError in distutils upload command.
X-Git-Tag: v2.7.8~279
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=91bf058c9890ce2559bcfeabcea16e94fd3763c9;p=thirdparty%2FPython%2Fcpython.git

Issue #12853: Correct NameError in distutils upload command.
---

diff --git a/Lib/distutils/command/upload.py b/Lib/distutils/command/upload.py
index d0133353a63a..c43607f42282 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 2638fc766e54..77bc5a81b0ca 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.