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
  ........
................
This commit is contained in:
Tarek Ziadé 2009-12-21 00:08:17 +00:00
parent 76c71ed9c5
commit 63d14c0752
3 changed files with 27 additions and 3 deletions

View file

@ -12,7 +12,7 @@ import socket
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 @@ class upload(PyPIRCCommand):
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'