[Python-checkins] cpython (merge 3.2 -> default): Issue #10571: Fix the "--sign" option of distutils' upload command.

[antoine.pitrou]

http://hg.python.org/cpython/rev/b45f105dbdfb
changeset:   77837:b45f105dbdfb
parent:      77835:9134bb4d0578
parent:      77836:ef16a3db4628
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Fri Jun 29 01:06:51 2012 +0200
summary:
  Issue #10571: Fix the "--sign" option of distutils' upload command.
Patch by Jakub Wilk.

files:
  Lib/distutils/command/upload.py |  2 +-
  Misc/ACKS                       |  1 +
  Misc/NEWS                       |  3 +++
  3 files changed, 5 insertions(+), 1 deletions(-)


diff --git a/Lib/distutils/command/upload.py b/Lib/distutils/command/upload.py
--- a/Lib/distutils/command/upload.py
+++ b/Lib/distutils/command/upload.py
@@ -125,7 +125,7 @@
 
         if self.sign:
             data['gpg_signature'] = (os.path.basename(filename) + ".asc",
-                                     open(filename+".asc").read())
+                                     open(filename+".asc", "rb").read())
 
         # set up the authentication
         user_pass = (self.username + ":" + self.password).encode('ascii')
diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1116,6 +1116,7 @@
 Gerry Wiener
 Frank Wierzbicki
 Bryce "Zooko" Wilcox-O'Hearn
+Jakub Wilk
 Gerald S. Williams
 Jason Williams
 John Williams
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -14,6 +14,9 @@
 Library
 -------
 
+- Issue #10571: Fix the "--sign" option of distutils' upload command.
+  Patch by Jakub Wilk.
+
 - Issue #9559: If messages were only added, a new file is no longer
   created and renamed over the old file when flush() is called on an
   mbox, MMDF or Babyl mailbox.

-- 
Repository URL: http://hg.python.org/cpython