summaryrefslogtreecommitdiff
path: root/Lib/distutils/command/upload.py
diff options
context:
space:
mode:
authorTarek Ziadé <ziade.tarek@gmail.com>2009-12-20 23:54:52 +0000
committerTarek Ziadé <ziade.tarek@gmail.com>2009-12-20 23:54:52 +0000
commite220d6793970e2ee0d71c5faa9cb712a4fe15de4 (patch)
tree85a380fec171c7e424b86686f3db3415c337eef3 /Lib/distutils/command/upload.py
parent59a389898efe8c55a344c01b1af61d315e216c86 (diff)
downloadcpython-git-e220d6793970e2ee0d71c5faa9cb712a4fe15de4.tar.gz
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 ........
Diffstat (limited to 'Lib/distutils/command/upload.py')
-rw-r--r--Lib/distutils/command/upload.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/Lib/distutils/command/upload.py b/Lib/distutils/command/upload.py
index 8805d41da0..9f1aae6aa4 100644
--- a/Lib/distutils/command/upload.py
+++ b/Lib/distutils/command/upload.py
@@ -11,7 +11,7 @@ import os
import socket
import platform
import httplib
-import base64
+from base64 import standard_b64encode
import urlparse
import cStringIO as StringIO
from ConfigParser import ConfigParser
@@ -115,7 +115,8 @@ class upload(PyPIRCCommand):
open(filename+".asc").read())
# set up the authentication
- auth = "Basic " + base64.encodestring(self.username + ":" + self.password).strip()
+ auth = "Basic " + standard_b64encode(self.username + ":" +
+ self.password)
# Build up the MIME payload for the POST data
boundary = '--------------GHSKFJDLGDS7543FJKLFHRE75642756743254'