summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2012-06-28 23:06:51 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2012-06-28 23:06:51 (GMT)
commitc92448beba60b022624b03068aea53800d0fd923 (patch)
treed1668da8d85e059785d24db1d166658b290505a2
parent9f558ccefd649ab52b76cf51e0c7d19237b238f1 (diff)
parent24319ac40737a3c305bbadca4f89c607a54ec967 (diff)
downloadcpython-c92448beba60b022624b03068aea53800d0fd923.zip
cpython-c92448beba60b022624b03068aea53800d0fd923.tar.gz
cpython-c92448beba60b022624b03068aea53800d0fd923.tar.bz2
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 4926aa3..8b36851 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 6d8681e..e2a4f9b 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1116,6 +1116,7 @@ Felix Wiemann
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
index 4dcbfc2..2d8d168 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -14,6 +14,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.