Issue #12853: Correct NameError in distutils upload command.

diff --git a/Lib/distutils/command/upload.py b/Lib/distutils/command/upload.py
index d0133353a63a6c4aed923cf16db3a2fa2b96afac..c43607f42282545765cb4f5e8d92ce97accbce56 100644 (file)
--- 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 2638fc766e5488ce24ca1665021b22ed83a7eeaa..77bc5a81b0ca2288a536a616ffda4fdd667800bd 100644 (file)
--- 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.