summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2012-06-29 01:05:26 +0200
committerAntoine Pitrou <solipsis@pitrou.net>2012-06-29 01:05:26 +0200
commit48165dea792df3636756c90664976a9e3e0c3db3 (patch)
treeb7253f628d5bfba30788cf5e6621ca9e74a66d64
parentacc950a2fc6d50f1c6c6ed4339600f307574d8ab (diff)
downloadcpython-48165dea792df3636756c90664976a9e3e0c3db3.tar.gz
Issue #10571: Fix the "--sign" option of distutils' upload command.
Patch by Jakub Wilk.
-rw-r--r--Lib/distutils/command/upload.py2
-rw-r--r--Misc/ACKS1
-rw-r--r--Misc/NEWS3
3 files changed, 5 insertions, 1 deletions
diff --git a/Lib/distutils/command/upload.py b/Lib/distutils/command/upload.py
index 4926aa3e15..8b36851d25 100644
--- a/Lib/distutils/command/upload.py
+++ b/Lib/distutils/command/upload.py
@@ -125,7 +125,7 @@ class upload(PyPIRCCommand):
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
index 514e95dbec..efa7339e2b 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1009,6 +1009,7 @@ Felix Wiemann
Gerry Wiener
Frank Wierzbicki
Bryce "Zooko" Wilcox-O'Hearn
+Jakub Wilk
Jason Williams
John Williams
Sue Williams
diff --git a/Misc/NEWS b/Misc/NEWS
index a8c274965d..242b8f76d1 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -81,6 +81,9 @@ Core and Builtins
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.