commit 63d14c0752dc9cc3cc6582bfde29f5f0d34433a7
author Tarek Ziadé <ziade.tarek@gmail.com> Mon Dec 21 00:08:17 2009 +0000
committer Tarek Ziadé <ziade.tarek@gmail.com> Mon Dec 21 00:08:17 2009 +0000
tree bf2f07817594306290590b253b7efc6710848d60
parent 76c71ed9c5bb3e3e85a8295c8a137579bba977ec

Merged revisions 76954 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r76954 | tarek.ziade | 2009-12-21 01:02:20 +0100 (Mon, 21 Dec 2009) | 9 lines

  Merged revisions 76952 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r76952 | tarek.ziade | 2009-12-21 00:23:34 +0100 (Mon, 21 Dec 2009) | 1 line

    Fixed #7552: fixed distutils.command.upload failure on very long passwords
  ........
................

Lib/distutils/command/upload.py

diff --git a/Lib/distutils/command/upload.py b/Lib/distutils/command/upload.py
index 3b4a036..f602fbe 100644
--- a/Lib/distutils/command/upload.py
+++ b/Lib/distutils/command/upload.py
@@ -12,7 +12,7 @@
 import platform
 import configparser
 import http.client as httpclient
-import base64
+from base64 import standard_b64encode
 import urllib.parse
 
 # this keeps compatibility for 2.3 and 2.4
@@ -127,7 +127,7 @@
         user_pass = (self.username + ":" + self.password).encode('ascii')
         # The exact encoding of the authentication string is debated.
         # Anyway PyPI only accepts ascii for both username or password.
-        auth = "Basic " + base64.encodebytes(user_pass).strip().decode('ascii')
+        auth = "Basic " + standard_b64encode(user_pass).decode('ascii')
 
         # Build up the MIME payload for the POST data
         boundary = '--------------GHSKFJDLGDS7543FJKLFHRE75642756743254'